Skip to content

Commit 67ea0a2

Browse files
keesgregkh
authored andcommitted
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>
1 parent de0952f commit 67ea0a2

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
9090
if (wep_key_len > 0) {
9191
wep_key_len = wep_key_len <= 5 ? 5 : 13;
9292
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);
9495
if (!pwep) {
9596
ret = -ENOMEM;
9697
goto exit;
@@ -582,7 +583,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
582583
if (wep_key_len > 0) {
583584
wep_key_len = wep_key_len <= 5 ? 5 : 13;
584585
wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material);
585-
pwep = kzalloc(wep_total_len, GFP_KERNEL);
586+
/* Allocate a full structure to avoid potentially running off the end. */
587+
pwep = kzalloc(sizeof(*pwep), GFP_KERNEL);
586588
if (!pwep)
587589
goto exit;
588590

0 commit comments

Comments
 (0)