iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen/netback: only non-freed SKB is queued into tx_queue

Browse Source 
After SKB is queued into tx_queue, it will be freed if request_gop is NULL.
However, no dequeue action is called in this situation, it is likely that
tx_queue constains freed SKB. This patch should fix this issue, and it is
based on 3.5.0-rc4+.

This issue is found through code inspection, no bug is seen with it currently.
I run netperf test for several hours, and no network regression was found.

Signed-off-by: Annie Li <annie.li@oracle.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Annie Li 2012-06-27 00:46:58 +00:00 committed by David S. Miller
parent 7fa8ad6df7
commit 1e0b6eac6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/xen-netback/netback.c
View File

@ -1363,8 +1363,6 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
INVALID_PENDING_IDX); INVALID_PENDING_IDX);
} }
__skb_queue_tail(&netbk->tx_queue, skb);
netbk->pending_cons++; netbk->pending_cons++;
request_gop = xen_netbk_get_requests(netbk, vif, request_gop = xen_netbk_get_requests(netbk, vif,
@ -1376,6 +1374,8 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
} }
gop = request_gop; gop = request_gop;
__skb_queue_tail(&netbk->tx_queue, skb);
vif->tx.req_cons = idx; vif->tx.req_cons = idx;
xen_netbk_check_rx_xenvif(vif); xen_netbk_check_rx_xenvif(vif);