Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'char-misc-6.10-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc fix from Greg KH:
"Here is one remaining bugfix for 6.10-rc1 that missed the 6.9-final
merge window, and has been sitting in my tree and linux-next for quite
a while now, but wasn't sent to you (my fault, travels...)

It is a bugfix to resolve an error in the speakup code that could
overflow a buffer.

It has been in linux-next for a while with no reported problems"

* tag 'char-misc-6.10-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
speakup: Fix sizeof() vs ARRAY_SIZE() bug

+1 -1
+1 -1
drivers/accessibility/speakup/main.c
··· 574 574 } 575 575 attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr); 576 576 buf[cnt++] = attr_ch; 577 - while (tmpx < vc->vc_cols - 1 && cnt < sizeof(buf) - 1) { 577 + while (tmpx < vc->vc_cols - 1 && cnt < ARRAY_SIZE(buf) - 1) { 578 578 tmp_pos += 2; 579 579 tmpx++; 580 580 ch = get_char(vc, (u_short *)tmp_pos, &temp);