[PATCH] Only disallow _setting_ of function key string

[safe/jmp/linux-2.6] / net / ieee80211 / ieee80211_rx.c

diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 8d87d66..ce694cf 100644 (file)
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -409,7 +409,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                return 1;
        }
 
-       if (is_multicast_ether_addr(hdr->addr1) ? ieee->host_mc_decrypt :
+       if ((is_multicast_ether_addr(hdr->addr1) ||
+            is_broadcast_ether_addr(hdr->addr2)) ? ieee->host_mc_decrypt :
            ieee->host_decrypt) {
                int idx = 0;
                if (skb->len >= hdrlen + 3)
@@ -917,8 +918,9 @@ static int ieee80211_parse_qos_info_param_IE(struct ieee80211_info_element
        return rc;
 }
 
-static int ieee80211_parse_info_param(struct ieee80211_info_element *info_element,
-                                       u16 length, struct ieee80211_network *network)
+static int ieee80211_parse_info_param(struct ieee80211_info_element
+                                     *info_element, u16 length,
+                                     struct ieee80211_network *network)
 {
        u8 i;
 #ifdef CONFIG_IEEE80211_DEBUG
@@ -929,11 +931,11 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element *info_elemen
        while (length >= sizeof(*info_element)) {
                if (sizeof(*info_element) + info_element->len > length) {
                        IEEE80211_DEBUG_MGMT("Info elem: parse failed: "
-                                           "info_element->len + 2 > left : "
-                                           "info_element->len+2=%zd left=%d, id=%d.\n",
-                                           info_element->len +
-                                           sizeof(*info_element),
-                                           length, info_element->id);
+                                            "info_element->len + 2 > left : "
+                                            "info_element->len+2=%zd left=%d, id=%d.\n",
+                                            info_element->len +
+                                            sizeof(*info_element),
+                                            length, info_element->id);
                        return 1;
                }
 
@@ -954,7 +956,7 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element *info_elemen
                                       IW_ESSID_MAX_SIZE - network->ssid_len);
 
                        IEEE80211_DEBUG_MGMT("MFIE_TYPE_SSID: '%s' len=%d.\n",
-                                           network->ssid, network->ssid_len);
+                                            network->ssid, network->ssid_len);
                        break;
 
                case MFIE_TYPE_RATES:
@@ -1074,17 +1076,20 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element *info_elemen
                        break;
 
                case MFIE_TYPE_QOS_PARAMETER:
-                       printk(KERN_ERR "QoS Error need to parse QOS_PARAMETER IE\n");
+                       printk(KERN_ERR
+                              "QoS Error need to parse QOS_PARAMETER IE\n");
                        break;
 
                default:
                        IEEE80211_DEBUG_MGMT("unsupported IE %d\n",
-                                           info_element->id);
+                                            info_element->id);
                        break;
                }
 
                length -= sizeof(*info_element) + info_element->len;
-               info_element = (struct ieee80211_info_element *) &info_element->data[info_element->len];
+               info_element =
+                   (struct ieee80211_info_element *)&info_element->
+                   data[info_element->len];
        }
 
        return 0;
@@ -1112,7 +1117,8 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee
        network->rates_len = network->rates_ex_len = 0;
        network->last_associate = 0;
        network->ssid_len = 0;
-       network->erp_value = (network->capability & WLAN_CAPABILITY_IBSS) ? 0x3 : 0x0;
+       network->erp_value =
+           (network->capability & WLAN_CAPABILITY_IBSS) ? 0x3 : 0x0;
 
        if (stats->freq == IEEE80211_52GHZ_BAND) {
                /* for A band (No DS info) */
@@ -1123,7 +1129,8 @@ static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct iee
        network->wpa_ie_len = 0;
        network->rsn_ie_len = 0;
 
-       if(ieee80211_parse_info_param(frame->info_element, stats->len - sizeof(*frame), network))
+       if (ieee80211_parse_info_param
+           (frame->info_element, stats->len - sizeof(*frame), network))
                return 1;
 
        network->mode = 0;
@@ -1185,7 +1192,8 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
        network->wpa_ie_len = 0;
        network->rsn_ie_len = 0;
 
-       if(ieee80211_parse_info_param(beacon->info_element, stats->len - sizeof(*beacon), network))
+       if (ieee80211_parse_info_param
+           (beacon->info_element, stats->len - sizeof(*beacon), network))
                return 1;
 
        network->mode = 0;