diff options
author | Eric Dumazet <edumazet@google.com> | 2012-09-10 15:22:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-10 18:58:31 -0400 |
commit | abf02cfc179bb4bd30d05f582d61b3b8f429b813 (patch) | |
tree | 16f5eb929c54b6b8d00b82ef1288744980551f8e | |
parent | 6d7d9798ad5c97ee4e911dd070dc12dc5ae55bd0 (diff) |
staging: r8712u: fix bug in r8712_recv_indicatepkt()
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: Dave Jones <davej@redhat.com>
Cc: stable <stable@vger.kernel.org> [2.6.37+]
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/rtl8712/recv_linux.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 0e26d5f6cf2d..495ee1205e02 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, | |||
117 | if (skb == NULL) | 117 | if (skb == NULL) |
118 | goto _recv_indicatepkt_drop; | 118 | goto _recv_indicatepkt_drop; |
119 | skb->data = precv_frame->u.hdr.rx_data; | 119 | skb->data = precv_frame->u.hdr.rx_data; |
120 | #ifdef NET_SKBUFF_DATA_USES_OFFSET | ||
121 | skb->tail = (sk_buff_data_t)(precv_frame->u.hdr.rx_tail - | ||
122 | precv_frame->u.hdr.rx_head); | ||
123 | #else | ||
124 | skb->tail = (sk_buff_data_t)precv_frame->u.hdr.rx_tail; | ||
125 | #endif | ||
126 | skb->len = precv_frame->u.hdr.len; | 120 | skb->len = precv_frame->u.hdr.len; |
121 | skb_set_tail_pointer(skb, skb->len); | ||
127 | if ((pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1)) | 122 | if ((pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1)) |
128 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 123 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
129 | else | 124 | else |