| From 5c46829158ad9c83d0805e94fe5f8d03deaf602f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 5 Jun 2021 11:31:00 -0400 |
| Subject: virtio_net: Remove BUG() to avoid machine dead |
| |
| From: Xianting Tian <xianting.tian@linux.alibaba.com> |
| |
| [ 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> |
| --- |
| drivers/net/virtio_net.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c |
| index 252f6718d730..2debb32a1813 100644 |
| --- a/drivers/net/virtio_net.c |
| +++ b/drivers/net/virtio_net.c |
| @@ -1625,7 +1625,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; |
| -- |
| 2.30.2 |
| |
