From patchwork Tue May 28 09:51:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 246789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 518722C030C for ; Tue, 28 May 2013 19:52:27 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UhGZo-0006Cr-4V; Tue, 28 May 2013 09:52:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UhGYv-0005jr-0F for kernel-team@lists.ubuntu.com; Tue, 28 May 2013 09:51:25 +0000 Received: from bl15-102-87.dsl.telepac.pt ([188.80.102.87] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UhGYt-0007jL-EL; Tue, 28 May 2013 09:51:23 +0000 From: Luis Henriques To: Johannes Berg Subject: [ 3.5.y.z extended stable ] Patch "mac80211: fix AP-mode frame matching" has been added to staging queue Date: Tue, 28 May 2013 10:51:22 +0100 Message-Id: <1369734682-6914-1-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.1.2 X-Extended-Stable: 3.5 Cc: Jouni Malinen , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled mac80211: fix AP-mode frame matching to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 662ab25991b6ac286143d5edd30fab4f791833d1 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 13 May 2013 16:42:40 +0200 Subject: [PATCH] mac80211: fix AP-mode frame matching commit 2b9ccd4e4308272e5aec614b77c5385e7ec2ec90 upstream. In AP mode, ignore frames with mis-matched BSSID that aren't multicast or sent to the correct destination. This fixes reporting public action frames to userspace multiple times on multiple virtual AP interfaces. Reported-by: Jouni Malinen Signed-off-by: Johannes Berg [ luis: adjust context ] Signed-off-by: Luis Henriques --- net/mac80211/rx.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.8.1.2 diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 064384c..1914a65 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2861,6 +2861,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, * and location updates. Note that mac80211 * itself never looks at these frames. */ + if (!multicast && + !ether_addr_equal(sdata->vif.addr, hdr->addr1)) + return 0; if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) && ieee80211_is_public_action(hdr, skb->len)) return 1;