linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: Pavel Roskin <proski@gnu.org>
Subject: [RFC/RFT 2/5] mac80211: clear TX control on filtered frames
Date: Tue, 15 Dec 2009 21:06:20 +0100	[thread overview]
Message-ID: <20091215200738.860691325@sipsolutions.net> (raw)
In-Reply-To: 20091215200618.253970634@sipsolutions.net

When an skb survived a round-trip through the driver
and needs to be re-used, its control information is
definitely not valid any more, the driver will have
overwritten it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 net/mac80211/status.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- wireless-testing.orig/net/mac80211/status.c	2009-12-15 20:09:33.000000000 +0100
+++ wireless-testing/net/mac80211/status.c	2009-12-15 20:13:51.000000000 +0100
@@ -69,6 +69,14 @@ static void ieee80211_handle_filtered_fr
 	 */
 	goto drop;
 
+	/*
+	 * This skb 'survived' a round-trip through the driver, and
+	 * hopefully the driver didn't mangle it too badly. However,
+	 * we can definitely not rely on the the control information
+	 * being correct. Clear it so we don't get junk there.
+	 */
+	memset(&info->control, 0, sizeof(info->control));
+
 	sta->tx_filtered_count++;
 
 	/*



  parent reply	other threads:[~2009-12-15 20:10 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-15 20:06 [RFC/RFT 0/5] mac80211: re-enable software retry Johannes Berg
2009-12-15 20:06 ` [RFC/RFT 1/5] mac80211: move and rename misc tx handler Johannes Berg
2009-12-15 20:06 ` Johannes Berg [this message]
2009-12-15 20:06 ` [RFC/RFT 3/5] mac80211: remove useless setting of IEEE80211_TX_INTFL_DONT_ENCRYPT Johannes Berg
2009-12-15 20:06 ` [RFC/RFT 4/5] mac80211: move control.hw_key assignment Johannes Berg
2009-12-15 20:06 ` [RFC/RFT 5/5] mac80211: re-enable re-transmission of filtered frames Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091215200738.860691325@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=proski@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).