* [PATCH] mac80211: Fix panic in aggregation handling
@ 2009-11-18 6:12 Sujith
2009-11-18 10:42 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Sujith @ 2009-11-18 6:12 UTC (permalink / raw)
To: linville; +Cc: johannes, linux-wireless
Not assigning the vif pointer causes an oops.
This patch fixes it.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
---
net/mac80211/agg-tx.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 6ddd114..26d42e8 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -489,6 +489,7 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
memcpy(&ra_tid->ra, ra, ETH_ALEN);
ra_tid->tid = tid;
+ ra_tid->vif = vif;
skb->pkt_type = IEEE80211_ADDBA_MSG;
skb_queue_tail(&local->skb_queue, skb);
@@ -625,6 +626,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
memcpy(&ra_tid->ra, ra, ETH_ALEN);
ra_tid->tid = tid;
+ ra_tid->vif = vif;
skb->pkt_type = IEEE80211_DELBA_MSG;
skb_queue_tail(&local->skb_queue, skb);
--
1.6.5.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: Fix panic in aggregation handling
2009-11-18 6:12 [PATCH] mac80211: Fix panic in aggregation handling Sujith
@ 2009-11-18 10:42 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2009-11-18 10:42 UTC (permalink / raw)
To: Sujith; +Cc: linville, linux-wireless
[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]
On Wed, 2009-11-18 at 11:42 +0530, Sujith wrote:
> Not assigning the vif pointer causes an oops.
> This patch fixes it.
Ouch, sorry about that, and thanks for the fix. I /thought/ I tested it
but apparently not :(
johannes
> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
> ---
> net/mac80211/agg-tx.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
> index 6ddd114..26d42e8 100644
> --- a/net/mac80211/agg-tx.c
> +++ b/net/mac80211/agg-tx.c
> @@ -489,6 +489,7 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
> ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
> memcpy(&ra_tid->ra, ra, ETH_ALEN);
> ra_tid->tid = tid;
> + ra_tid->vif = vif;
>
> skb->pkt_type = IEEE80211_ADDBA_MSG;
> skb_queue_tail(&local->skb_queue, skb);
> @@ -625,6 +626,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
> ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
> memcpy(&ra_tid->ra, ra, ETH_ALEN);
> ra_tid->tid = tid;
> + ra_tid->vif = vif;
>
> skb->pkt_type = IEEE80211_DELBA_MSG;
> skb_queue_tail(&local->skb_queue, skb);
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-18 10:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-18 6:12 [PATCH] mac80211: Fix panic in aggregation handling Sujith
2009-11-18 10:42 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox