From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Jim Cromie <jim.cromie@gmail.com>,
Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
linux-hwmon@vger.kernel.org,
"Gustavo A . R . Silva" <gustavoars@kernel.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.19 13/23] hwmon: (pc87360) Bounds check data->innr usage
Date: Mon, 22 Jan 2024 10:17:53 -0500 [thread overview]
Message-ID: <20240122151823.997644-13-sashal@kernel.org> (raw)
In-Reply-To: <20240122151823.997644-1-sashal@kernel.org>
From: Kees Cook <keescook@chromium.org>
[ Upstream commit 4265eb062a7303e537ab3792ade31f424c3c5189 ]
Without visibility into the initializers for data->innr, GCC suspects
using it as an index could walk off the end of the various 14-element
arrays in data. Perform an explicit clamp to the array size. Silences
the following warning with GCC 12+:
../drivers/hwmon/pc87360.c: In function 'pc87360_update_device':
../drivers/hwmon/pc87360.c:341:49: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=]
341 | data->in_max[i] = pc87360_read_value(data,
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
342 | LD_IN, i,
| ~~~~~~~~~
343 | PC87365_REG_IN_MAX);
| ~~~~~~~~~~~~~~~~~~~
../drivers/hwmon/pc87360.c:209:12: note: at offset 255 into destination object 'in_max' of size 14
209 | u8 in_max[14]; /* Register value */
| ^~~~~~
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20231130200207.work.679-kees@kernel.org
[groeck: Added comment into code clarifying context]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hwmon/pc87360.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 7e3697727537..d2b3137dccd4 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -1637,7 +1637,11 @@ static struct pc87360_data *pc87360_update_device(struct device *dev)
}
/* Voltages */
- for (i = 0; i < data->innr; i++) {
+ /*
+ * The min() below does not have any practical meaning and is
+ * only needed to silence a warning observed with gcc 12+.
+ */
+ for (i = 0; i < min(data->innr, ARRAY_SIZE(data->in)); i++) {
data->in_status[i] = pc87360_read_value(data, LD_IN, i,
PC87365_REG_IN_STATUS);
/* Clear bits */
--
2.43.0
next prev parent reply other threads:[~2024-01-22 15:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 15:17 [PATCH AUTOSEL 4.19 01/23] f2fs: fix to check return value of f2fs_reserve_new_block() Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 02/23] ALSA: hda: Refer to correct stream index at loops Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 03/23] ASoC: doc: Fix undefined SND_SOC_DAPM_NOPM argument Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 04/23] fast_dput(): handle underflows gracefully Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 05/23] RDMA/IPoIB: Fix error code return in ipoib_mcast_join Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 06/23] drm/drm_file: fix use of uninitialized variable Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 07/23] drm/framebuffer: Fix " Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 08/23] drm/mipi-dsi: Fix detach call without attach Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 09/23] media: stk1160: Fixed high volume of stk1160_dbg messages Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 10/23] media: rockchip: rga: fix swizzling for RGB formats Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 11/23] PCI: add INTEL_HDA_ARL to pci_ids.h Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 12/23] ALSA: hda: Intel: add HDA_ARL PCI ID support Sasha Levin
2024-01-22 15:17 ` Sasha Levin [this message]
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 14/23] drm/exynos: Call drm_atomic_helper_shutdown() at shutdown/unbind time Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 15/23] IB/ipoib: Fix mcast list locking Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 16/23] media: ddbridge: fix an error code problem in ddb_probe Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 17/23] drm/msm/dpu: Ratelimit framedone timeout msgs Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 18/23] clk: hi3620: Fix memory leak in hi3620_mmc_clk_init() Sasha Levin
2024-01-22 15:17 ` [PATCH AUTOSEL 4.19 19/23] clk: mmp: pxa168: Fix memory leak in pxa168_clk_init() Sasha Levin
2024-01-22 15:18 ` [PATCH AUTOSEL 4.19 20/23] watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786 Sasha Levin
2024-01-22 15:18 ` [PATCH AUTOSEL 4.19 21/23] drm/amd/display: make flip_timestamp_in_us a 64-bit variable Sasha Levin
2024-01-22 15:18 ` [PATCH AUTOSEL 4.19 22/23] drm/amdgpu: Let KFD sync with VM fences Sasha Levin
2024-01-22 15:18 ` [PATCH AUTOSEL 4.19 23/23] drm/amdgpu: Drop 'fence' check in 'to_amdgpu_amdkfd_fence()' Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240122151823.997644-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=gustavoars@kernel.org \
--cc=jdelvare@suse.com \
--cc=jim.cromie@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox