tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

broadcom_sta: Add patch to fix NULL pointer deref

The patch is from the following Gentoo bug:

https://bugs.gentoo.org/show_bug.cgi?id=523326#c24

Built successfully against Linux 3.18.36, 4.4.16 and 4.7.0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @phreedom, @vcunat
(cherry picked from commit fef4b62657903021f9b60fc6a6cf6fe4bac167ed)

authored by aszlig and committed by Graham Christensen 8daf7e99 cbdd3719

+14
unified split
+1
pkgs/os-specific/linux/broadcom-sta/default.nix
··· 23 ./i686-build-failure.patch 24 ./license.patch 25 ./linux-4.7.patch 26 ./gcc.patch 27 ]; 28
··· 23 ./i686-build-failure.patch 24 ./license.patch 25 ./linux-4.7.patch 26 + ./null-pointer-fix.patch 27 ./gcc.patch 28 ]; 29
+13
pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
···
··· 1 + diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c 2 + --- a/src/wl/sys/wl_linux.c 2015-01-06 12:33:42.981659618 +0100 3 + +++ b/src/wl/sys/wl_linux.c 2015-01-06 12:34:05.647395418 +0100 4 + @@ -2157,8 +2157,8 @@ 5 + wlif = WL_DEV_IF(dev); 6 + wl = WL_INFO(dev); 7 + 8 + + skb->prev = NULL; 9 + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { 10 + - skb->prev = NULL; 11 + 12 + TXQ_LOCK(wl); 13 +