diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-01-11 11:12:31 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-11 11:17:08 -0500 |
| commit | 34e654d965567266d78919d448a797e55f6ec266 (patch) | |
| tree | 336c3fe8b110f7f94c135b21d91c9dfe2504196e /mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch | |
| parent | 8ee86905b0588beb08110b40dd11df1476abe320 (diff) | |
| download | kernel-34e654d965567266d78919d448a797e55f6ec266.tar.gz kernel-34e654d965567266d78919d448a797e55f6ec266.tar.xz kernel-34e654d965567266d78919d448a797e55f6ec266.zip | |
Patch from Stanislaw Gruszka to fix NULL ptr deref in mac80211 (rhbz 769766)
Diffstat (limited to 'mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch')
| -rw-r--r-- | mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch b/mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch new file mode 100644 index 000000000..abacee637 --- /dev/null +++ b/mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch @@ -0,0 +1,47 @@ +Since: + +commit 816c04fe7ef01dd9649f5ccfe796474db8708be5 +Author: Christian Lamparter <chunkeey@googlemail.com> +Date: Sat Apr 30 15:24:30 2011 +0200 + + mac80211: consolidate MIC failure report handling + +is possible to that we dereference rx->key == NULL when driver set +RX_FLAG_MMIC_STRIPPED and not RX_FLAG_IV_STRIPPED and we are in +promiscuous mode. This happen with rt73usb and rt61pci at least. + +Before the commit we always check rx->key against NULL, so I assume +fix should be done in mac80211 (also mic_fail path has similar check). + +References: +https://bugzilla.redhat.com/show_bug.cgi?id=769766 +http://rt2x00.serialmonkey.com/pipermail/users_rt2x00.serialmonkey.com/2012-January/004395.html + +Cc: stable@vger.kernel.org # 3.0+ +Reported-by: Stuart D Gathman <stuart@gathman.org> +Reported-by: Kai Wohlfahrt <kai.scorpio@gmail.com> +Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> +--- + net/mac80211/wpa.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c +index 93aab07..422b798 100644 +--- a/net/mac80211/wpa.c ++++ b/net/mac80211/wpa.c +@@ -106,7 +106,7 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx) + if (status->flag & RX_FLAG_MMIC_ERROR) + goto mic_fail; + +- if (!(status->flag & RX_FLAG_IV_STRIPPED)) ++ if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key) + goto update_iv; + + return RX_CONTINUE; +-- +1.7.1 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-wireless" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file |