netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: r8712u: fix bug in r8712_recv_indicatepkt()
@ 2012-09-10 19:22 Eric Dumazet
  2012-09-10 19:40 ` Larry Finger
  0 siblings, 1 reply; 9+ messages in thread
From: Eric Dumazet @ 2012-09-10 19:22 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Larry Finger, netdev, Dave Jones

From: Eric Dumazet <edumazet@google.com>

64bit arches have a buggy r8712u driver, let's fix it.

skb->tail must be set properly or network stack behavior is undefined.

Addresses https://bugzilla.redhat.com/show_bug.cgi?id=847525
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=45071

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Dave Jones <davej@redhat.com>
Cc: stable@vger.kernel.org [2.6.37+]
---
 drivers/staging/rtl8712/recv_linux.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c
index 0e26d5f..495ee12 100644
--- a/drivers/staging/rtl8712/recv_linux.c
+++ b/drivers/staging/rtl8712/recv_linux.c
@@ -117,13 +117,8 @@ void r8712_recv_indicatepkt(struct _adapter *padapter,
 	if (skb == NULL)
 		goto _recv_indicatepkt_drop;
 	skb->data = precv_frame->u.hdr.rx_data;
-#ifdef NET_SKBUFF_DATA_USES_OFFSET
-	skb->tail = (sk_buff_data_t)(precv_frame->u.hdr.rx_tail -
-		     precv_frame->u.hdr.rx_head);
-#else
-	skb->tail = (sk_buff_data_t)precv_frame->u.hdr.rx_tail;
-#endif
 	skb->len = precv_frame->u.hdr.len;
+	skb_set_tail_pointer(skb, skb->len);
 	if ((pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1))
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 	else

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] staging: r8712u: fix bug in r8712_recv_indicatepkt()
@ 2012-09-12 17:52 Aki Parviainen
  2012-09-12 18:25 ` Eric Dumazet
  0 siblings, 1 reply; 9+ messages in thread
From: Aki Parviainen @ 2012-09-12 17:52 UTC (permalink / raw)
  To: edumazet; +Cc: netdev

>From: Eric Dumazet <edumazet@google.com>
>
>64bit arches have a buggy r8712u driver, let's fix it.
>
>skb->tail must be set properly or network stack behavior is undefined.
>
>Addresses https://bugzilla.redhat.com/show_bug.cgi?id=847525
>Addresses https://bugzilla.kernel.org/show_bug.cgi?id=45071
>
>Signed-off-by: Eric Dumazet <edumazet@google.com>
>Cc: Larry Finger <Larry.Finger@lwfinger.net>
>Cc: Dave Jones <davej@redhat.com>
>Cc: stable@vger.kernel.org [2.6.37+]

Tested this patch on 64bit linux-3.6-rc5 & fixes problem for me. Thank
you very much for fixing this very annoying & long time open bug!

Tested-by: Aki Parviainen <aki.parviainen@iki.fi>

Aki

>---
> drivers/staging/rtl8712/recv_linux.c |    7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
>diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c
>index 0e26d5f..495ee12 100644
>--- a/drivers/staging/rtl8712/recv_linux.c
>+++ b/drivers/staging/rtl8712/recv_linux.c
>@@ -117,13 +117,8 @@ void r8712_recv_indicatepkt(struct _adapter *padapter,
>  if (skb == NULL)
>  goto _recv_indicatepkt_drop;
>  skb->data = precv_frame->u.hdr.rx_data;
>-#ifdef NET_SKBUFF_DATA_USES_OFFSET
>- skb->tail = (sk_buff_data_t)(precv_frame->u.hdr.rx_tail -
>-     precv_frame->u.hdr.rx_head);
>-#else
>- skb->tail = (sk_buff_data_t)precv_frame->u.hdr.rx_tail;
>-#endif
>  skb->len = precv_frame->u.hdr.len;
>+ skb_set_tail_pointer(skb, skb->len);
>  if ((pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1))
>  skb->ip_summed = CHECKSUM_UNNECESSARY;
>  else

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-09-12 18:25 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <50369925.3050705@lwfinger.net>
     [not found] ` <1345757200.5904.1890.camel@edumazet-glaptop>
     [not found]   ` <50378B35.80307@lwfinger.net>
     [not found]     ` <20120824.111948.680531915905273128.davem@davemloft.net>
     [not found]       ` <5037A4B0.3080208@lwfinger.net>
     [not found]         ` <1345825095.19483.19.camel@edumazet-glaptop>
     [not found]           ` <1345825432.19483.20.camel@edumazet-glaptop>
     [not found]             ` <5037B2AC.50704@lwfinger.net>
     [not found]               ` <1345830424.19483.69.camel@edumazet-glaptop>
     [not found]                 ` <503BB49C.5010402@lwfinger.net>
     [not found]                   ` <503BB49C.5010402-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2012-09-10  8:39                     ` Regression associated with commit c8628155ece3 - "tcp: reduce out_of_order memory use" Eric Dumazet
2012-09-10 14:53                       ` Larry Finger
     [not found]                         ` <504DFEFF.6060004-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
2012-09-10 15:04                           ` Eric Dumazet
2012-09-10 17:55                             ` [PATCH] staging: r8712u: fix bug in r8712_recv_indicatepkt() Eric Dumazet
2012-09-10 18:34                               ` Larry Finger
2012-09-10 19:22 Eric Dumazet
2012-09-10 19:40 ` Larry Finger
  -- strict thread matches above, loose matches on Subject: below --
2012-09-12 17:52 Aki Parviainen
2012-09-12 18:25 ` Eric Dumazet

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).