From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EE68472783 for ; Wed, 17 Jun 2026 15:04:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781708661; cv=none; b=kkWgwPQSScZigpDLYQJy8y3fvlmxRadlTVVXx5jTQEl5AymKQ2Csya9AIC/APEDH/FWflxyHBfxpvGuPFB8SKsiKDJ+119nLyx5KIg2G/LXvrbXVhj82O1HqjVUdevvVFacRpgfO2Kt6lspb5SoTyLCsFzGRE0qVPCJx8Ts/NmU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781708661; c=relaxed/simple; bh=IJZYeU8nAGhKDiOr/eCSlIvhpsaaTQLsJcvcGm3GJ9o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ll5TBM0AFu3Kvfig4drCroi3FdZ+NSe1jfy6p0gDhY+41AAM5trvKv2Io1znDtvQ1gAQUslqbu8P7dilEOasbZYze3CfuPpdZ+AfidRyeFlZSiSxA02ZJfTaBPEuu9/XPHqjH5mllAgoyFFDlMGpvc1uWDbn0v+Hg0v7jo/cmW8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RpvZiZE/; arc=none smtp.client-ip=74.125.224.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RpvZiZE/" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-662bf1dab83so2273619d50.3 for ; Wed, 17 Jun 2026 08:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781708659; x=1782313459; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YCNmDDZkyDCvREs0izKIJJ9NBdHLWOor2XurOTFM618=; b=RpvZiZE/BngorazpIaOurds8ENQAhwk9Le1/QrZQAiiBf2Mw4z/prgdGJyTJJUrgA1 LIXJvpNEcM86MO3mXuXHqY28pG1Dwir5Q7fMAUef+lsr3AglSLcf0LiDoXSsY5/J6p62 2tkLFkRDQaPNo1Vycaxpf82GAiX9VAfZPLbx23SagJ81HuFRSi49aiEIvJOAPJ2WrwgT Vdu3uFS3pMc7g1+Z/p6jUoHxMrxVR9V4j+PiSuHMvAdfi3V3uZmdYGxScW8VeTjWrYAF EcpC3GalfOeqDr86KsQ9322UunJW/wQnyl7Bl4x1dsoKa90DGYRgi5nPo4FrCWjE6ywQ G/Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781708659; x=1782313459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YCNmDDZkyDCvREs0izKIJJ9NBdHLWOor2XurOTFM618=; b=Zll39zXWjFOUEs9REA+MEd/mpBuLWV8RWAL3zHRL3ztX2OU+NoCXuIzJyR8lYD55A3 xKR1i/4Ct8PBEz5fVFCtQ7mfBCLvnTBWkI6U7WrPbCvdTmW7FyC7+11lqBsjuFrndxFr anAdssHjPtYZURpFgQ2iwDwFNfVQ/xifsj+PeWECPiRqP+e6liFE5a9FNnAytv7GBaGi C5Nwf3wvqbz4fUmcj2oHvvvdoEgL0DKhefACRvfvCuCk3b+LE8OFilxQHQCtk8ILZFTZ 6SpFVuM6vsHsfnEhHhaM8KQ3nKtt01OnEWnXDkAaAnvA5JxfjhWF0gNEfxUSGfRLDHwm pWWg== X-Forwarded-Encrypted: i=1; AFNElJ8Dvo/8Uadg9dEoRKnwUbt3XPPjqAX2vv/+A0hR4PpfvhmslxWHGKWWxs+XBf0uOwVIIdv7bfryQViJQBE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7MdZsRwQ0/fWpsV7heWnWK5uvL36U61/3PwrnXWCapCQ7RijG qrPENsZ87QqYlr7v1tcwEFsz9jwy1DK7wj8g0GDE0p1tYUH3Jvczf7zf X-Gm-Gg: AfdE7clFz6hnm4tYh89B6c9uhq7gk0CIybj+MCvyZA8o8pSJyBfOdMUl3ytXwNZMui3 qrofxEB+qpkESlYPWMK4odTD014nhrblAqCYlsfY20dO6YK4GsEA3EsvC9E+g6a8Fa8vM09XLe6 7PvRjw9OHfXqkmidaT7y+nSftYG1MbK8CKF+pNLJNy/sxGm1EDUhiz+CK9FWjyIea+A/WrNpWQL UMXma9OumbuInOj2oxs0NIs1DvVI/Dd8901t0/Wz/X2+xMFLPmn+bbndci/kgIYMXWz90+g8MJh 6Q7z6pwn1qc0r/YUJyLrpUchVR+TvP7YvdQua7mfGixwofYgV9L9Bko8eiC/1Jj0Tn+5mKmSdIj 2HxNHiTLUjwp+lhXBQ7AcdznAQYqBWAAiqQnQd+22b6K1xNAP/Gi0eW9ZJuCAOVNxk3qoHZS0Fj YlCm4Ta1gOFg== X-Received: by 2002:a05:690e:d57:b0:660:78f9:7e7f with SMTP id 956f58d0204a3-662cb87eeb4mr3643165d50.3.1781708659378; Wed, 17 Jun 2026 08:04:19 -0700 (PDT) Received: from arch.localdomain ([2409:8a28:a52:c491::1002]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-662b976e47csm4387677d50.20.2026.06.17.08.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 08:04:18 -0700 (PDT) From: Jun Yan To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jun Yan , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 08/10] Input: cap11xx - guard unsupported DT properties before parsing Date: Wed, 17 Jun 2026 23:02:47 +0800 Message-ID: <20260617150318.753148-9-jerrysteve1101@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260617150318.753148-1-jerrysteve1101@gmail.com> References: <20260617150318.753148-1-jerrysteve1101@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Check of_property_present() before parsing microchip,calib-sensitivity and microchip,signal-guard, so that models which do not support these properties (e.g. CAP1114) skip the parsing entirely. This prevents a potential buffer overflow in calib_sensitivities[8] and signal_guard_inputs_mask when a model with more than 8 channels (CAP1114 has 14) would otherwise call of_property_read_u32_array() with num_channels as the element count. Signed-off-by: Jun Yan --- drivers/input/keyboard/cap11xx.c | 52 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 0f19ee036e78..275eb79a7193 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -231,10 +231,13 @@ static int cap11xx_init_keys(struct cap11xx_priv *priv) } } - if (!of_property_read_u32_array(node, "microchip,calib-sensitivity", - priv->calib_sensitivities, - priv->model->num_channels)) { - if (priv->model->has_sensitivity_control) { + if (of_property_present(node, "microchip,calib-sensitivity")) { + if (!priv->model->has_sensitivity_control) { + dev_warn(dev, + "This model doesn't support 'calib-sensitivity'\n"); + } else if (!of_property_read_u32_array(node, "microchip,calib-sensitivity", + priv->calib_sensitivities, + priv->model->num_channels)) { for (i = 0; i < priv->model->num_channels; i++) { if (!is_power_of_2(priv->calib_sensitivities[i]) || priv->calib_sensitivities[i] > 4) { @@ -254,32 +257,31 @@ static int cap11xx_init_keys(struct cap11xx_priv *priv) if (error) return error; } - } else { - dev_warn(dev, - "This model doesn't support 'calib-sensitivity'\n"); } } - for (i = 0; i < priv->model->num_channels; i++) { - if (!of_property_read_u32_index(node, "microchip,signal-guard", - i, &u32_val)) { - if (u32_val > 1) - return -EINVAL; - if (u32_val) - priv->signal_guard_inputs_mask |= 0x01 << i; - } - } - - if (priv->signal_guard_inputs_mask) { - if (priv->model->has_signal_guard) { - error = regmap_write(priv->regmap, - CAP11XX_REG_SIGNAL_GUARD_ENABLE, - priv->signal_guard_inputs_mask); - if (error) - return error; - } else { + if (of_property_present(node, "microchip,signal-guard")) { + if (!priv->model->has_signal_guard) { dev_warn(dev, "This model doesn't support 'signal-guard'\n"); + } else { + for (i = 0; i < priv->model->num_channels; i++) { + if (!of_property_read_u32_index(node, "microchip,signal-guard", + i, &u32_val)) { + if (u32_val > 1) + return -EINVAL; + if (u32_val) + priv->signal_guard_inputs_mask |= 0x01 << i; + } + } + + if (priv->signal_guard_inputs_mask) { + error = regmap_write(priv->regmap, + CAP11XX_REG_SIGNAL_GUARD_ENABLE, + priv->signal_guard_inputs_mask); + if (error) + return error; + } } } -- 2.54.0