From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
alsa-devel@alsa-project.org, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 5.10 09/19] ASoC: kirkwood: Iterate over array indexes instead of using pointer math
Date: Sun, 26 Feb 2023 21:09:44 -0500 [thread overview]
Message-ID: <20230227020957.1052252-9-sashal@kernel.org> (raw)
In-Reply-To: <20230227020957.1052252-1-sashal@kernel.org>
From: Kees Cook <keescook@chromium.org>
[ Upstream commit b3bcedc0402fcdc5c8624c433562d9d1882749d8 ]
Walking the dram->cs array was seen as accesses beyond the first array
item by the compiler. Instead, use the array index directly. This allows
for run-time bounds checking under CONFIG_UBSAN_BOUNDS as well. Seen
with GCC 13 with -fstrict-flex-arrays:
../sound/soc/kirkwood/kirkwood-dma.c: In function
'kirkwood_dma_conf_mbus_windows.constprop':
../sound/soc/kirkwood/kirkwood-dma.c:90:24: warning: array subscript 0 is outside array bounds of 'const struct mbus_dram_window[0]' [-Warray-bounds=]
90 | if ((cs->base & 0xffff0000) < (dma & 0xffff0000)) {
| ~~^~~~~~
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230127224128.never.410-kees@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/kirkwood/kirkwood-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index e037826b24517..2d41e6ab2ce4e 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -86,7 +86,7 @@ kirkwood_dma_conf_mbus_windows(void __iomem *base, int win,
/* try to find matching cs for current dma address */
for (i = 0; i < dram->num_cs; i++) {
- const struct mbus_dram_window *cs = dram->cs + i;
+ const struct mbus_dram_window *cs = &dram->cs[i];
if ((cs->base & 0xffff0000) < (dma & 0xffff0000)) {
writel(cs->base & 0xffff0000,
base + KIRKWOOD_AUDIO_WIN_BASE_REG(win));
--
2.39.0
next prev parent reply other threads:[~2023-02-27 2:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 2:09 [PATCH AUTOSEL 5.10 01/19] drm/amd/display: Fix potential null-deref in dm_resume Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 02/19] drm/omap: dsi: Fix excessive stack usage Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 03/19] HID: Add Mapping for System Microphone Mute Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 04/19] drm/tiny: ili9486: Do not assume 8-bit only SPI controllers Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 05/19] drm/radeon: free iio for atombios when driver shutdown Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 06/19] drm: amd: display: Fix memory leakage Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 07/19] drm/msm/dsi: Add missing check for alloc_ordered_workqueue Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 08/19] docs/scripts/gdb: add necessary make scripts_gdb step Sasha Levin
2023-02-27 2:09 ` Sasha Levin [this message]
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 10/19] regulator: max77802: Bounds check regulator id against opmode Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 11/19] regulator: s5m8767: Bounds check id indexing into arrays Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 12/19] gfs2: Improve gfs2_make_fs_rw error handling Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 13/19] hwmon: (coretemp) Simplify platform device handling Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 14/19] pinctrl: at91: use devm_kasprintf() to avoid potential leaks Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 15/19] HID: logitech-hidpp: Don't restart communication if not necessary Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 16/19] drm: panel-orientation-quirks: Add quirk for Lenovo IdeaPad Duet 3 10IGL5 Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 17/19] dm thin: add cond_resched() to various workqueue loops Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 18/19] dm cache: " Sasha Levin
2023-02-27 2:09 ` [PATCH AUTOSEL 5.10 19/19] nfsd: zero out pointers after putting nfsd_files on COPY setup error 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=20230227020957.1052252-9-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=keescook@chromium.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.com \
/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