From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F7B4C47082 for ; Sat, 5 Jun 2021 16:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 240E861244 for ; Sat, 5 Jun 2021 16:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbhFEQEA (ORCPT ); Sat, 5 Jun 2021 12:04:00 -0400 Received: from m15113.mail.126.com ([220.181.15.113]:43423 "EHLO m15113.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbhFEQEA (ORCPT ); Sat, 5 Jun 2021 12:04:00 -0400 X-Greylist: delayed 1817 seconds by postgrey-1.27 at vger.kernel.org; Sat, 05 Jun 2021 12:03:59 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=P3aIecmfoywK4mYusA PSwpZJz/rMOG9160tktUCGrgI=; b=Qyn4F8UskAm4T1MMsebRgU8jr+6qGrh31r v8E78W2sstGTMbaKW86irQMEoPnFKOWOayGbSrE4tA9dZxXlbCTEm2aHui9KBgso vJzG5uzFW/b15jZWeU+pxkhPPc1ez4QBgO/hQ+hkeA2P+H7zYzgOiAsWth5qWux7 inkF7YMug= Received: from 192.168.137.133 (unknown [112.10.85.142]) by smtp3 (Coremail) with SMTP id DcmowABHl__CmLtghDc3SA--.48781S3; Sat, 05 Jun 2021 23:31:15 +0800 (CST) From: Xianting Tian To: mst@redhat.com, jasowang@redhat.com, davem@davemloft.net, kuba@kernel.org, linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Xianting Tian Subject: [PATCH] [v2] virtio_net: Remove BUG() to avoid machine dead Date: Sat, 5 Jun 2021 11:31:00 -0400 Message-Id: <1622907060-8417-1-git-send-email-xianting_tian@126.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: DcmowABHl__CmLtghDc3SA--.48781S3 X-Coremail-Antispam: 1Uf129KBjvdXoWruF18Kr4rJFyfXF1UuF4xXrb_yoW3Krc_Cr yxtF4fGrW5KF12k3yxCa1rZr9xt3WFvF18WwnIq3s3ua1jyFy5Xr92vrnrJry7G340yF98 GFZxJr1v93saqjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8dOz3UUUUU== X-Originating-IP: [112.10.85.142] X-CM-SenderInfo: h0ld03plqjs3xldqqiyswou0bp/1tbi5gSopFpEBDQX7wAAs4 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xianting Tian 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 --- 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 9b6a4a8..7f11ea4 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1623,7 +1623,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; -- 1.8.3.1