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

staging: rtl8723bs: Allocate full pwep structure

The pwep allocation was always being allocated smaller than the true
structure size. Avoid this by always allocating the full structure.
Found with GCC 12 and -Warray-bounds:

../drivers/staging/rtl8723bs/os_dep/ioctl_linux.c: In function 'rtw_set_encryption':
../drivers/staging/rtl8723bs/os_dep/ioctl_linux.c:591:29: warning: array subscript 'struct ndis_802_11_wep[0]' is partly outside array bounds of 'void[25]' [-Warray-bounds]
591 | pwep->length = wep_total_len;
| ^~

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Fabio Aiuto <fabioaiuto83@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220608215512.1070847-1-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Kees Cook and committed by
Greg Kroah-Hartman
67ea0a2a de0952f2

+4 -2
+4 -2
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
··· 90 90 if (wep_key_len > 0) { 91 91 wep_key_len = wep_key_len <= 5 ? 5 : 13; 92 92 wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material); 93 - pwep = kzalloc(wep_total_len, GFP_KERNEL); 93 + /* Allocate a full structure to avoid potentially running off the end. */ 94 + pwep = kzalloc(sizeof(*pwep), GFP_KERNEL); 94 95 if (!pwep) { 95 96 ret = -ENOMEM; 96 97 goto exit; ··· 583 582 if (wep_key_len > 0) { 584 583 wep_key_len = wep_key_len <= 5 ? 5 : 13; 585 584 wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material); 586 - pwep = kzalloc(wep_total_len, GFP_KERNEL); 585 + /* Allocate a full structure to avoid potentially running off the end. */ 586 + pwep = kzalloc(sizeof(*pwep), GFP_KERNEL); 587 587 if (!pwep) 588 588 goto exit; 589 589