From patchwork Tue Nov 26 18:13:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathy Vanhoef X-Patchwork-Id: 3240531 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E6EBC9F3B8 for ; Tue, 26 Nov 2013 18:22:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C47D920445 for ; Tue, 26 Nov 2013 18:22:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC3152043C for ; Tue, 26 Nov 2013 18:22:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932720Ab3KZSWK (ORCPT ); Tue, 26 Nov 2013 13:22:10 -0500 Received: from hermes2.cs.kuleuven.be ([134.58.40.2]:57062 "EHLO hermes2.cs.kuleuven.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932718Ab3KZSWF (ORCPT ); Tue, 26 Nov 2013 13:22:05 -0500 X-Greylist: delayed 421 seconds by postgrey-1.27 at vger.kernel.org; Tue, 26 Nov 2013 13:22:05 EST Received: from hermes2.cs.kuleuven.be. (localhost [127.0.0.1]) by hermes2.cs.kuleuven.be. with ESMTP id rAQIF1I8023490 for ; Tue, 26 Nov 2013 19:15:01 +0100 Received: (from defang@localhost) by hermes2.cs.kuleuven.be. (8.14.4/8.14.4/Submit) id rAQIDccS023458 for ; Tue, 26 Nov 2013 19:13:38 +0100 X-Authentication-Warning: hermes2.cs.kuleuven.be.: defang set sender to using -f Received: from dr-zook2.cs.kuleuven.be. (dr-zook2.cs.kuleuven.be [2a02:2c40:0:a005::127]) by mailrelay2.cs.kuleuven.be (envelope-sender ) (MIMEDefang) with ESMTP id rAQIDb5g023456; Tue, 26 Nov 2013 19:13:38 +0100 Received: from localhost (localhost [127.0.0.1]) by dr-zook2.cs.kuleuven.be. (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id rAQIDbXK029288; Tue, 26 Nov 2013 19:13:37 +0100 X-Virus-Scanned: Debian amavisd-new at dr-zook2.cs.kuleuven.be Received: from dr-zook2.cs.kuleuven.be. ([127.0.0.1]) by localhost (dr-zook2.cs.kuleuven.be [127.0.0.1]) (amavisd-new, port 10024) with LMTP id j3k04Lcd5wLJ; Tue, 26 Nov 2013 19:13:26 +0100 (CET) Received: from canis.cs.kuleuven.be. (pop4.cs.kuleuven.be [IPv6:2a02:2c40:0:a000::125]) by dr-zook2.cs.kuleuven.be. (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id rAQIDPvp029284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 26 Nov 2013 19:13:25 +0100 Received: from [IPv6:2a02:2c40:100:a000:11d3:4273:d4e8:ab3c] ([IPv6:2a02:2c40:100:a000:11d3:4273:d4e8:ab3c]) (authenticated bits=0) by canis.cs.kuleuven.be. (A_Good_MTA/8.14.3/Debian-9.1ubuntu1) with ESMTP id rAQIDNHK017599 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 26 Nov 2013 19:13:24 +0100 Message-ID: <5294E4C5.4050301@cs.kuleuven.be> Date: Tue, 26 Nov 2013 19:13:25 +0100 From: Mathy Vanhoef User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: linville@tuxdriver.com CC: linux-wireless@vger.kernel.org, mcgrof@qca.qualcomm.com, jouni@qca.qualcomm.com, vthiagar@qca.qualcomm.com, senthilb@qca.qualcomm.com Subject: [PATCH] ath9k_htc: properly set MAC address and BSSID mask X-Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm X-Scanned-By: MIMEDefang 2.71 on 127.0.1.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Mathy Vanhoef" Pick the MAC address of the first virtual interface as the new hardware MAC address. Set BSSID mask according to this MAC address. This fixes CVE-2013-4579. Signed-off-by: Mathy Vanhoef --- Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm -- 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 diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index d441045..84359c3 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -147,21 +147,26 @@ static void ath9k_htc_bssid_iter(void *data, u8 *mac, struct ieee80211_vif *vif) struct ath9k_vif_iter_data *iter_data = data; int i; - for (i = 0; i < ETH_ALEN; i++) - iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]); + if (iter_data->hw_macaddr != NULL) { + for (i = 0; i < ETH_ALEN; i++) + iter_data->mask[i] &= ~(iter_data->hw_macaddr[i] ^ mac[i]); + } else { + iter_data->hw_macaddr = mac; + } } -static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv, +static void ath9k_htc_set_mac_bssid_mask(struct ath9k_htc_priv *priv, struct ieee80211_vif *vif) { struct ath_common *common = ath9k_hw_common(priv->ah); struct ath9k_vif_iter_data iter_data; /* - * Use the hardware MAC address as reference, the hardware uses it - * together with the BSSID mask when matching addresses. + * Pick the MAC address of the first interface as the new hardware + * MAC address. The hardware will use it together with the BSSID mask + * when matching addresses. */ - iter_data.hw_macaddr = common->macaddr; + iter_data.hw_macaddr = NULL; memset(&iter_data.mask, 0xff, ETH_ALEN); if (vif) @@ -173,6 +178,10 @@ static void ath9k_htc_set_bssid_mask(struct ath9k_htc_priv *priv, ath9k_htc_bssid_iter, &iter_data); memcpy(common->bssidmask, iter_data.mask, ETH_ALEN); + + if (iter_data.hw_macaddr) + memcpy(common->macaddr, iter_data.hw_macaddr, ETH_ALEN); + ath_hw_setbssidmask(common); } @@ -1083,7 +1092,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, goto out; } - ath9k_htc_set_bssid_mask(priv, vif); + ath9k_htc_set_mac_bssid_mask(priv, vif); priv->vif_slot |= (1 << avp->index); priv->nvifs++; @@ -1148,7 +1157,7 @@ static void ath9k_htc_remove_interface(struct ieee80211_hw *hw, ath9k_htc_set_opmode(priv); - ath9k_htc_set_bssid_mask(priv, vif); + ath9k_htc_set_mac_bssid_mask(priv, vif); /* * Stop ANI only if there are no associated station interfaces. diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index b6aad69..99ab0aa 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -885,8 +885,9 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw, struct ath_common *common = ath9k_hw_common(ah); /* - * Use the hardware MAC address as reference, the hardware uses it - * together with the BSSID mask when matching addresses. + * Pick the MAC address of the first interface as the new hardware + * MAC address. The hardware will use it together with the BSSID mask + * when matching addresses. */ memset(iter_data, 0, sizeof(*iter_data)); memset(&iter_data->mask, 0xff, ETH_ALEN);