* [PATCH] speakup: Fix sizeof() vs ARRAY_SIZE() bug
@ 2024-04-15 11:02 Dan Carpenter
2024-04-15 13:12 ` Samuel Thibault
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2024-04-15 11:02 UTC (permalink / raw)
To: Samuel Thibault
Cc: William Hubbs, Chris Brannon, Kirk Reiser, Greg Kroah-Hartman,
Randy Dunlap, speakup, linux-kernel, kernel-janitors
The "buf" pointer is an array of u16 values. This code should be
using ARRAY_SIZE() (which is 256) instead of sizeof() (which is 512),
otherwise it can the still got out of bounds.
Fixes: c8d2f34ea96e ("speakup: Avoid crash on very long word")
Cc: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/accessibility/speakup/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/accessibility/speakup/main.c b/drivers/accessibility/speakup/main.c
index 736c2eb8c0f3..f677ad2177c2 100644
--- a/drivers/accessibility/speakup/main.c
+++ b/drivers/accessibility/speakup/main.c
@@ -574,7 +574,7 @@ static u_long get_word(struct vc_data *vc)
}
attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr);
buf[cnt++] = attr_ch;
- while (tmpx < vc->vc_cols - 1 && cnt < sizeof(buf) - 1) {
+ while (tmpx < vc->vc_cols - 1 && cnt < ARRAY_SIZE(buf) - 1) {
tmp_pos += 2;
tmpx++;
ch = get_char(vc, (u_short *)tmp_pos, &temp);
--
2.43.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] speakup: Fix sizeof() vs ARRAY_SIZE() bug
2024-04-15 11:02 [PATCH] speakup: Fix sizeof() vs ARRAY_SIZE() bug Dan Carpenter
@ 2024-04-15 13:12 ` Samuel Thibault
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Thibault @ 2024-04-15 13:12 UTC (permalink / raw)
To: Dan Carpenter
Cc: William Hubbs, Chris Brannon, Kirk Reiser, Greg Kroah-Hartman,
Randy Dunlap, speakup, linux-kernel, kernel-janitors
Dan Carpenter, le lun. 15 avril 2024 14:02:23 +0300, a ecrit:
> The "buf" pointer is an array of u16 values. This code should be
> using ARRAY_SIZE() (which is 256) instead of sizeof() (which is 512),
> otherwise it can the still got out of bounds.
>
> Fixes: c8d2f34ea96e ("speakup: Avoid crash on very long word")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org
Thanks!
> ---
> drivers/accessibility/speakup/main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/accessibility/speakup/main.c b/drivers/accessibility/speakup/main.c
> index 736c2eb8c0f3..f677ad2177c2 100644
> --- a/drivers/accessibility/speakup/main.c
> +++ b/drivers/accessibility/speakup/main.c
> @@ -574,7 +574,7 @@ static u_long get_word(struct vc_data *vc)
> }
> attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr);
> buf[cnt++] = attr_ch;
> - while (tmpx < vc->vc_cols - 1 && cnt < sizeof(buf) - 1) {
> + while (tmpx < vc->vc_cols - 1 && cnt < ARRAY_SIZE(buf) - 1) {
> tmp_pos += 2;
> tmpx++;
> ch = get_char(vc, (u_short *)tmp_pos, &temp);
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-15 13:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-15 11:02 [PATCH] speakup: Fix sizeof() vs ARRAY_SIZE() bug Dan Carpenter
2024-04-15 13:12 ` Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®