diff options
| author | Annie Li <Annie.li@oracle.com> | 2012-06-27 00:46:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 00:50:20 -0700 |
| commit | 1e0b6eac6a150a35b45d019681b0021896354ae5 (patch) | |
| tree | 97b778fcefabf41c3cefce8eea3b476d26ee7ad4 | |
| parent | 7fa8ad6df71f4778b23e17b0106aaef02b518684 (diff) | |
| download | op-kernel-dev-1e0b6eac6a150a35b45d019681b0021896354ae5.zip op-kernel-dev-1e0b6eac6a150a35b45d019681b0021896354ae5.tar.gz | |
xen/netback: only non-freed SKB is queued into tx_queue
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>
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index f4a6fca..682633bf 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1363,8 +1363,6 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk) INVALID_PENDING_IDX); } - __skb_queue_tail(&netbk->tx_queue, skb); - netbk->pending_cons++; 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; + __skb_queue_tail(&netbk->tx_queue, skb); + vif->tx.req_cons = idx; xen_netbk_check_rx_xenvif(vif); |
