Re: mac80211 truesize bugs

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <johannes@...>
Cc: <mb@...>, <netdev@...>, <linux-wireless@...>
Date: Thursday, May 1, 2008 - 5:43 am

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 01 May 2008 11:32:29 +0200


I looked at the mac80211 code, the problem is the skb_push() you
guys do in this situation.

Things like loopback, which also orphan then reinject, don't trigger
this problem because the re-input path trims things, never adds.

The good news is that this is easy to fix.

Since you've orphaned the SKB, simply adjust skb->truesize as you
do pushes.  Like this:

mac80211: Adjust truesize in ieee80211_tx_status() when reinjecting.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 9ad4e36..de2e904 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1485,6 +1485,9 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
 	rthdr = (struct ieee80211_tx_status_rtap_hdr*)
 				skb_push(skb, sizeof(*rthdr));
 
+	/* This is safe because the buffer has been orphaned.  */
+	skb->truesize += sizeof(*rthdr);
+
 	memset(rthdr, 0, sizeof(*rthdr));
 	rthdr->hdr.it_len = cpu_to_le16(sizeof(*rthdr));
 	rthdr->hdr.it_present =
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
mac80211 truesize bugs, Johannes Berg, (Wed Apr 30, 10:02 pm)
frame status API? (was: mac80211 truesize bugs), Johannes Berg, (Sat May 3, 9:55 pm)
Re: mac80211 truesize bugs, Michael Buesch, (Thu May 1, 4:58 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:08 am)
Re: mac80211 truesize bugs, Michael Buesch, (Thu May 1, 5:32 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:34 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:20 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:32 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:43 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 6:36 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:49 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 7:02 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:53 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:58 am)
Re: mac80211 truesize bugs, Herbert Xu, (Thu May 1, 7:03 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 8:38 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 8:59 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 12:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 6:56 pm)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 7:07 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:15 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Fri May 2, 4:38 pm)
Re: mac80211 truesize bugs, David Miller, (Fri May 2, 7:33 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:52 am)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 9:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 9:42 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:09 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 10:02 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:08 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 10:12 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:22 pm)
Re: mac80211 truesize bugs, Herbert Xu, (Sat May 3, 11:16 pm)
Re: mac80211 truesize bugs, David Miller, (Sun May 4, 6:38 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 4:47 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 5:14 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 5:44 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 5:52 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 7:25 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:28 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 8:45 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 10:06 am)
Re: mac80211 truesize bugs, David Miller, (Sun May 4, 6:45 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 6:48 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 12:03 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 1:47 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:52 am)
Re: mac80211 truesize bugs, Herbert Xu, (Sun May 4, 8:56 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 9:00 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sun May 4, 8:48 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 5:37 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 10:25 am)
Re: mac80211 truesize bugs, David Miller, (Mon May 12, 11:17 pm)
Re: mac80211 truesize bugs, John W. Linville, (Tue May 13, 4:39 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Tue May 13, 4:59 pm)
Re: mac80211 truesize bugs, Tomas Winkler, (Tue May 13, 5:12 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Tue May 13, 5:37 pm)
Re: mac80211 truesize bugs, David Miller, (Tue May 13, 6:09 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 8:05 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 7:49 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 7:38 am)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:24 pm)
Re: mac80211 truesize bugs, David Miller, (Sat May 3, 7:32 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Sat May 3, 7:43 pm)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 5:48 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 5:56 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:08 am)
Re: mac80211 truesize bugs, David Miller, (Thu May 1, 6:32 am)
Re: mac80211 truesize bugs, Johannes Berg, (Thu May 1, 6:45 am)