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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 10506C11F66 for ; Tue, 6 Jul 2021 12:01:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E573D620EC for ; Tue, 6 Jul 2021 12:01:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239619AbhGFL7o (ORCPT ); Tue, 6 Jul 2021 07:59:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:47572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237127AbhGFLf4 (ORCPT ); Tue, 6 Jul 2021 07:35:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 22DD461EA4; Tue, 6 Jul 2021 11:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570740; bh=vSV+KP7kK+8dQ477OOy/G5Ve/6OIMh37u26Cm3/UnEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uk1BKwB6xJZjMd6vkKE4ebt4wXVpPVcQTBKJr9IyvrqDSc9LpGilfh0CNp7zjcLYh PSgj1U4kl5xq08xNG29CTZdahn3Einw/OZPD7Kiq3T/QKti2RwfJ1C4IumLWX5Heyy NSYr2HAPwmBByJNnt4IVlE7ELn9E6sCxViMLwNqMpfaWmFIEU7WGZomWl/+RCoqqa1 DZ5pgvKS4CHUnfDi+vHeZ4I7pZZHfEt31iCLpncQNVWxvLUy9LYIoebjJRTnKyZoae gDSdPpbn2UWc4ZpYL3bC5XfEc6sZ7Ude9o2sGRfwE4VMgkkBmSG6hPhblnU+CZJ1gn f4XynHhFuAifQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xianting Tian , Leon Romanovsky , "David S . Miller" , Sasha Levin , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 30/74] virtio_net: Remove BUG() to avoid machine dead Date: Tue, 6 Jul 2021 07:24:18 -0400 Message-Id: <20210706112502.2064236-30-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112502.2064236-1-sashal@kernel.org> References: <20210706112502.2064236-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xianting Tian [ 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 Reviewed-by: Leon Romanovsky Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 d8ee001d8e8e..5cd55f950032 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1548,7 +1548,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