]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8152: fix accessing skb after napi_gro_receive
authorHayes Wang <hayeswang@realtek.com>
Mon, 19 Aug 2019 03:15:19 +0000 (11:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Aug 2019 01:13:24 +0000 (18:13 -0700)
Fix accessing skb after napi_gro_receive which is caused by
commit 47922fcde536 ("r8152: support skb_add_rx_frag").

Fixes: 47922fcde536 ("r8152: support skb_add_rx_frag")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 40d18e866269d594c4f406a366b07588ebe36f44..b1db6df6f4ab9b4d35d0633df8de002b1ca2a001 100644 (file)
@@ -2094,10 +2094,10 @@ static int rx_bottom(struct r8152 *tp, int budget)
                        skb->protocol = eth_type_trans(skb, netdev);
                        rtl_rx_vlan_tag(rx_desc, skb);
                        if (work_done < budget) {
-                               napi_gro_receive(napi, skb);
                                work_done++;
                                stats->rx_packets++;
                                stats->rx_bytes += skb->len;
+                               napi_gro_receive(napi, skb);
                        } else {
                                __skb_queue_tail(&tp->rx_queue, skb);
                        }