Skip to content

Commit ad4f15d

Browse files
jgross1davem330
authored andcommitted
xen/netfront: don't bug in case of too many frags
Commit 57f230a ("xen/netfront: raise max number of slots in xennet_get_responses()") raised the max number of allowed slots by one. This seems to be problematic in some configurations with netback using a larger MAX_SKB_FRAGS value (e.g. old Linux kernel with MAX_SKB_FRAGS defined as 18 instead of nowadays 17). Instead of BUG_ON() in this case just fall back to retransmission. Fixes: 57f230a ("xen/netfront: raise max number of slots in xennet_get_responses()") Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 22d0bd8 commit ad4f15d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/net/xen-netfront.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,11 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
908908
BUG_ON(pull_to <= skb_headlen(skb));
909909
__pskb_pull_tail(skb, pull_to - skb_headlen(skb));
910910
}
911-
BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
911+
if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
912+
queue->rx.rsp_cons = ++cons;
913+
kfree_skb(nskb);
914+
return ~0U;
915+
}
912916

913917
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
914918
skb_frag_page(nfrag),
@@ -1045,6 +1049,8 @@ static int xennet_poll(struct napi_struct *napi, int budget)
10451049
skb->len += rx->status;
10461050

10471051
i = xennet_fill_frags(queue, skb, &tmpq);
1052+
if (unlikely(i == ~0U))
1053+
goto err;
10481054

10491055
if (rx->flags & XEN_NETRXF_csum_blank)
10501056
skb->ip_summed = CHECKSUM_PARTIAL;

0 commit comments

Comments
 (0)