Re: [PATCH net-next] liquidio: Avoid accessing skb after submitting to input queue

[David Miller]

From: Felix Manlunas 
Date: Thu, 26 Jan 2017 11:52:35 -0800

> From: Satanand Burla 
> 
> 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 
> Signed-off-by: Derek Chickles 
> Signed-off-by: Raghu Vatsavayi 
> Signed-off-by: Felix Manlunas 

Applied, thanks.

[PATCH net-next] liquidio: Avoid accessing skb after submitting to input queue

[Felix Manlunas]

From: Satanand Burla 

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 
Signed-off-by: Derek Chickles 
Signed-off-by: Raghu Vatsavayi 
Signed-off-by: Felix Manlunas 
---
 drivers/net/ethernet/cavium/liquidio/lio_main.c| 6 +++---
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 5ee3f00..9261ddc 100644
--- 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 e96cf6c..a6587d7 100644
--- 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;