Return-path: Received: from cpsmtpb-ews08.kpnxchange.com ([213.75.39.13]:2350 "EHLO cpsmtpb-ews08.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751941Ab1G3NrK (ORCPT ); Sat, 30 Jul 2011 09:47:10 -0400 Message-ID: <4E340A0C.5040604@gmail.com> (sfid-20110730_154745_317600_B0AAE203) Date: Sat, 30 Jul 2011 15:41:32 +0200 From: Gertjan van Wingerde MIME-Version: 1.0 To: Stanislaw Gruszka CC: Larry Finger , Justin Piszcz , Ivo van Doorn , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, Alan Piszcz , "users@rt2x00.serialmonkey.com" Subject: Re: [PATCH] rt2x00: rt2800: fix zeroing skb structure References: <4E318BD0.40202@lwfinger.net> <20110730113009.GA2847@redhat.com> <20110730113255.GB2847@redhat.com> In-Reply-To: <20110730113255.GB2847@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 07/30/11 13:32, Stanislaw Gruszka wrote: > We should clear skb->data not skb itself. Bug was introduced by: > commit 0b8004aa12d13ec750d102ba4082a95f0107c649 "rt2x00: Properly > reserve room for descriptors in skbs". > > Cc: stable@kernel.org # 2.6.36+ > Signed-off-by: Stanislaw Gruszka Ouch. Good catch. Let me go find a brown paper bag now :-( Not sure if this is the source of Justin's problems, though. Acked-by: Gertjan van Wingerde > --- > drivers/net/wireless/rt2x00/rt2800lib.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c > index 75d2c6c..f94d669 100644 > --- a/drivers/net/wireless/rt2x00/rt2800lib.c > +++ b/drivers/net/wireless/rt2x00/rt2800lib.c > @@ -703,8 +703,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) > /* > * Add space for the TXWI in front of the skb. > */ > - skb_push(entry->skb, TXWI_DESC_SIZE); > - memset(entry->skb, 0, TXWI_DESC_SIZE); > + memset(skb_push(entry->skb, TXWI_DESC_SIZE), 0, TXWI_DESC_SIZE); > > /* > * Register descriptor details in skb frame descriptor. -- --- Gertjan