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

Commit f033fbac authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman
Browse files

xen/netfront: tolerate frags with no data 



[ Upstream commit d81c5054a5d1d4999c7cdead7636b6cd4af83d36 ]

At least old Xen net backends seem to send frags with no real data
sometimes. In case such a fragment happens to occur with the frag limit
already reached the frontend will BUG currently even if this situation
is easily recoverable.

Modify the BUG_ON() condition accordingly.

Tested-by: default avatarDietmar Hahn <dietmar.hahn@ts.fujitsu.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80f09807

drivers/net/xen-netfront.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, 
		if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {

			unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;



			BUG_ON(pull_to <= skb_headlen(skb));

			BUG_ON(pull_to < skb_headlen(skb));

			__pskb_pull_tail(skb, pull_to - skb_headlen(skb));

		}

		if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {