From patchwork Mon Jan 28 16:11:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 2056531 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 52E6FDF2A1 for ; Mon, 28 Jan 2013 16:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754205Ab3A1QMb (ORCPT ); Mon, 28 Jan 2013 11:12:31 -0500 Received: from narfation.org ([79.140.41.39]:42830 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753444Ab3A1QMa (ORCPT ); Mon, 28 Jan 2013 11:12:30 -0500 Received: from sven-desktop.home.narfation.org (drsd-4d05aed1.pool.mediaWays.net [77.5.174.209]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 9D54894025; Mon, 28 Jan 2013 17:12:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=20121; t=1359389549; bh=jbLjV3npIZVFrYVbFM8ckTv5aIPdvt/9PRqOjnVoFcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQpqiFRqSXBLUJIMxf7rBwKNiQk28Cm23J4snkBcQWlRj/9N3vOK79/G+qNLpjh12 sCVUmrTWilH4ZD1OflESZqfmlnX4mM+3NxtvW4YK1aAfhKdkAi50Ug761F8aQ1mjsF JAJ6j+Qvv9fr+9wXDNldSM70KwotAbpoQmDC85o8= From: Sven Eckelmann To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, linville@tuxdriver.com, ordex@autistici.org, simon.wunderlich@s2003.tu-chemnitz.de, rgibson@futurec.net, Sven Eckelmann Subject: [RFC 1/3] mac80211: Allow group key for IBSS WPA_NONE Date: Mon, 28 Jan 2013 17:11:51 +0100 Message-Id: <1359389513-1554-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <30210911.93HAZKKtRJ@bentobox> References: <30210911.93HAZKKtRJ@bentobox> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org WPA_NONE uses the shared group key to encrypt the protected frames. Therefore, it must also be allowed for non-multicast frames to use the group key for decryption. Signed-off-by: Sven Eckelmann --- net/mac80211/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index a190895..d412fd0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1160,7 +1160,9 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) if (rx->key && rx->key->conf.cipher != WLAN_CIPHER_SUITE_WEP40 && rx->key->conf.cipher != WLAN_CIPHER_SUITE_WEP104 && - !is_multicast_ether_addr(hdr->addr1)) + !is_multicast_ether_addr(hdr->addr1) && + (rx->sdata->vif.type != NL80211_IFTYPE_ADHOC || + rx->sdata->u.ibss.control_port)) rx->key = NULL; } }