Unverified Commit a2417da8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9505 CVE-2024-38587 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Z5NQ6TUGBHQRD3GRTGI7AQ7ZEKBS45PP/ 
*** BLURB HERE ***

Dan Carpenter (1):
  speakup: Fix sizeof() vs ARRAY_SIZE() bug


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IA6SI7 
 
Link:https://gitee.com/openeuler/kernel/pulls/9505

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents bc4efa88 ce6c3d59

drivers/staging/speakup/main.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,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);