From: Xianting Tian <xianting.tian@linux.alibaba.com>
Date: Sat, 5 Jun 2021 15:31:00 +0000 (-0400)
Subject: virtio_net: Remove BUG() to avoid machine dead
X-Git-Tag: v5.12.18~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd05367fbe4f6afd4281d7c62f8bd145a1598624;p=thirdparty%2Fkernel%2Fstable.git

virtio_net: Remove BUG() to avoid machine dead

[ Upstream commit 85eb1389458d134bdb75dad502cc026c3753a619 ]

We should not directly BUG() when there is hdr error, it is
better to output a print when such error happens. Currently,
the caller of xmit_skb() already did it.

Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 447582fa20a59..f7ce341bb328f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1558,7 +1558,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
 	if (virtio_net_hdr_from_skb(skb, &hdr->hdr,
 				    virtio_is_little_endian(vi->vdev), false,
 				    0))
-		BUG();
+		return -EPROTO;
 
 	if (vi->mergeable_rx_bufs)
 		hdr->num_buffers = 0;