summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-15 16:26:18 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-15 16:26:18 -0500
commit6c1c9987c61dc3c67ad8ffbd9ea2ec3fe4eba73f (patch)
tree1a4491b62780d491d5bb8d7eb9842f9b2143c171
parent08ed1426b23d62fafab7409be125ff3201a442c7 (diff)
downloadkernel-6c1c9987c61dc3c67ad8ffbd9ea2ec3fe4eba73f.tar.gz
kernel-6c1c9987c61dc3c67ad8ffbd9ea2ec3fe4eba73f.tar.xz
kernel-6c1c9987c61dc3c67ad8ffbd9ea2ec3fe4eba73f.zip
Apply mac80211 NULL ptr deref fix to compat-wireless too (rhbz 769766)
-rw-r--r--kernel.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index b935ea0f0..2c0fd3771 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1548,6 +1548,7 @@ ApplyPatch compat-wireless-config-fixups.patch
ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch
ApplyPatch compat-wireless-integrated-build.patch
ApplyPatch compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
+ApplyPatch mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
cd ..
@@ -2319,6 +2320,7 @@ fi
%changelog
* Sun Jan 15 2012 Josh Boyer <jwboyer@redhat.com>
- Avoid packaging symlinks for kernel-doc files (rhbz 767351)
+- Apply mac80211 NULL ptr deref fix to compat-wireless too (rhbz 769766)
* Fri Jan 13 2012 Dave Jones <davej@redhat.com>
- Disable NFC drivers.