Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e0b6eac authored by Annie Li's avatar Annie Li Committed by David S. Miller
Browse files

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: default avatarAnnie Li <annie.li@oracle.com>
Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fa8ad6d

drivers/net/xen-netback/netback.c

+2 −2
Original line number Diff line number Diff line
@@ -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);