]> git.baikalelectronics.ru Git - kernel.git/commit
staging: rtl: fix possible NULL pointer dereference
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Jan 2017 14:53:08 +0000 (15:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jan 2017 17:08:57 +0000 (18:08 +0100)
commit8024f9312b36ea04c0ec282df01e8f07463a000f
tree372af2c69e0a41c15ddbf301ddbde84163324301
parent5e2989e33dc5957fd8fd3c89b98a73ccbf7e2815
staging: rtl: fix possible NULL pointer dereference

gcc-7 detects that wlanhdr_to_ethhdr() in two drivers calls memcpy() with
a destination argument that an earlier function call may have set to NULL:

staging/rtl8188eu/core/rtw_recv.c: In function 'wlanhdr_to_ethhdr':
staging/rtl8188eu/core/rtw_recv.c:1318:2: warning: argument 1 null where non-null expected [-Wnonnull]
staging/rtl8712/rtl871x_recv.c: In function 'r8712_wlanhdr_to_ethhdr':
staging/rtl8712/rtl871x_recv.c:649:2: warning: argument 1 null where non-null expected [-Wnonnull]

I'm fixing this by adding a NULL pointer check and returning failure
from the function, which is hopefully already handled properly.

This seems to date back to when the drivers were originally added,
so backporting the fix to stable seems appropriate. There are other
related realtek drivers in the kernel, but none of them contain a
function with a similar name or produce this warning.

Cc: stable@vger.kernel.org
Fixes: 23d537ab6920 ("staging: r8188eu: Add files for new driver - part 5")
Fixes: 91786735aed5 ("staging: r8712u: Add the new driver to the mainline kernel")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_recv.c
drivers/staging/rtl8712/rtl871x_recv.c