liquidio: Avoid accessing skb after submitting to input queue

Accessing skb after submitting to input queue can cause
access to stale pointers if the skb ends up being transmitted
and freed by that time.

Signed-off-by: Satanand Burla <[email protected]>
Signed-off-by: Derek Chickles <[email protected]>
Signed-off-by: Raghu Vatsavayi <[email protected]>
Signed-off-by: Felix Manlunas <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 5ee3f007c613b1c1c9de541fc0b30b2e81f3930a..9261ddc0685238ff8882b021ab18bd88c12bbc6e 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -3316,11 +3316,11 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        netif_trans_update(netdev);
 
-       if (skb_shinfo(skb)->gso_size)
-               stats->tx_done += skb_shinfo(skb)->gso_segs;
+       if (tx_info->s.gso_segs)
+               stats->tx_done += tx_info->s.gso_segs;
        else
                stats->tx_done++;
-       stats->tx_tot_bytes += skb->len;
+       stats->tx_tot_bytes += ndata.datasize;
 
        return NETDEV_TX_OK;
 

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index e96cf6cdecfd2bd5f733284e1d1b4f71b5d34353..a6587d7019ed5ad9aa7f73717e0435160816857d 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -2433,11 +2433,11 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        netif_trans_update(netdev);
 
-       if (skb_shinfo(skb)->gso_size)
-               stats->tx_done += skb_shinfo(skb)->gso_segs;
+       if (tx_info->s.gso_segs)
+               stats->tx_done += tx_info->s.gso_segs;
        else
                stats->tx_done++;
-       stats->tx_tot_bytes += skb->len;
+       stats->tx_tot_bytes += ndata.datasize;
 
        return NETDEV_TX_OK;