Attachment 235711 Details for Bug 311901 – linux-2.6-mac80211-decryption-noise.patch

[patch] linux-2.6-mac80211-decryption-noise.patch

linux-2.6-mac80211-decryption-noise.patch (text/plain), 3.17 KB, created by John W. Linville on 2007-10-24 00:31:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. Linville

Created: 2007-10-24 00:31:03 UTC

Size: 3.17 KB

patch

obsolete

>diff -up linux-2.6.23.noarch/net/mac80211/rx.c.orig linux-2.6.23.noarch/net/mac80211/rx.c
>--- linux-2.6.23.noarch/net/mac80211/rx.c.orig	2007-10-23 20:18:05.000000000 -0400
>+++ linux-2.6.23.noarch/net/mac80211/rx.c	2007-10-23 20:22:21.000000000 -0400
>@@ -568,6 +568,8 @@ ieee80211_rx_h_wep_weak_iv_detection(str
> static ieee80211_txrx_result
> ieee80211_rx_h_wep_decrypt(struct ieee80211_txrx_data *rx)
> {
>+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
>+
> 	if ((rx->key && rx->key->conf.alg != ALG_WEP) ||
> 	    !(rx->fc & IEEE80211_FCTL_PROTECTED) ||
> 	    ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
>@@ -576,7 +578,13 @@ ieee80211_rx_h_wep_decrypt(struct ieee80
> 		return TXRX_CONTINUE;
> 
> 	if (!rx->key) {
>-		if (net_ratelimit())
>+		/* if there are multiple SSIDs on this BSSID, the frame may
>+		   not be for us anyway; so, check that either the frame is
>+		   unicast or that we are not in managed mode before
>+		   complaining about a missing key */
>+		if ((!is_multicast_ether_addr(hdr->addr1) ||
>+		     rx->sdata->type != IEEE80211_IF_TYPE_STA) &&
>+		    net_ratelimit())
> 			printk(KERN_DEBUG "%s: RX WEP frame, but no key set\n",
> 			       rx->dev->name);
> 		return TXRX_DROP;
>diff -up linux-2.6.23.noarch/net/mac80211/wpa.c.orig linux-2.6.23.noarch/net/mac80211/wpa.c
>--- linux-2.6.23.noarch/net/mac80211/wpa.c.orig	2007-10-23 20:25:09.000000000 -0400
>+++ linux-2.6.23.noarch/net/mac80211/wpa.c	2007-10-23 20:25:03.000000000 -0400
>@@ -462,9 +462,16 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
> 					  skb->len - hdrlen, rx->sta->addr,
> 					  hwaccel, rx->u.rx.queue);
> 	if (res != TKIP_DECRYPT_OK || wpa_test) {
>-		printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
>-		       MAC_FMT " (res=%d)\n",
>-		       rx->dev->name, MAC_ARG(rx->sta->addr), res);
>+		/* if there are multiple SSIDs on this BSSID, the frame may
>+		   not be for us anyway; so, check that either the frame is
>+		   unicast or that we are not in managed mode before
>+		   complaining about a missing key */
>+		if ((!is_multicast_ether_addr(hdr->addr1) ||
>+		     rx->sdata->type != IEEE80211_IF_TYPE_STA) &&
>+		    net_ratelimit())
>+			printk(KERN_DEBUG "%s: TKIP decrypt failed for RX "
>+			       "frame from " MAC_FMT " (res=%d)\n",
>+			       rx->dev->name, MAC_ARG(rx->sta->addr), res);
> 		return TXRX_DROP;
> 	}
> 
>@@ -773,9 +780,17 @@ ieee80211_rx_h_ccmp_decrypt(struct ieee8
> 			    skb->data + hdrlen + CCMP_HDR_LEN, data_len,
> 			    skb->data + skb->len - CCMP_MIC_LEN,
> 			    skb->data + hdrlen + CCMP_HDR_LEN)) {
>-			printk(KERN_DEBUG "%s: CCMP decrypt failed for RX "
>-			       "frame from " MAC_FMT "\n", rx->dev->name,
>-			       MAC_ARG(rx->sta->addr));
>+			/* if there are multiple SSIDs on this BSSID,
>+			   the frame may not be for us anyway; so, check
>+			   that either the frame is unicast or that we
>+			   are not in managed mode before complaining
>+			   about a missing key */
>+			if ((!is_multicast_ether_addr(hdr->addr1) ||
>+			     rx->sdata->type != IEEE80211_IF_TYPE_STA) &&
>+			    net_ratelimit())
>+				printk(KERN_DEBUG "%s: CCMP decrypt failed "
>+				       "for RX frame from " MAC_FMT "\n",
>+				       rx->dev->name, MAC_ARG(rx->sta->addr));
> 			return TXRX_DROP;
> 		}
> 	}

Actions: View | Diff

Attachments on bug 311901: 234141 | 235621 | 235631 | 235711