From patchwork Wed Oct 21 06:05:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11848303 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9E8F014B4 for ; Wed, 21 Oct 2020 06:08:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 118FC22249 for ; Wed, 21 Oct 2020 06:08:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HXiUIqlV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 118FC22249 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kV7Ih-0003RT-Jr for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Oct 2020 02:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV7I5-00032E-Fe for qemu-devel@nongnu.org; Wed, 21 Oct 2020 02:08:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kV7I3-0006hH-AM for qemu-devel@nongnu.org; Wed, 21 Oct 2020 02:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603260481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eEAe6dlChLWJ7BmZMSpvhJUBzgaGIA4NwTqnKQswswY=; b=HXiUIqlV4C+i3EV7YlZY6vUKi3/2VjZafIgBl0QEfI+Fzmy+busgMkA1sVFVM1IVZCsq8y dtuB54dGhoqvOzYjPQZg+RfyCLQsDbXSX4Yv1IL4jcrr10Vp1hln2w8YKNH1gjQ33ynOyA gpfuUZZxUIanv8SLCimPPzeyNFSIV7Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-mZTUBrC0Pre0QlhpVdCsAQ-1; Wed, 21 Oct 2020 02:07:58 -0400 X-MC-Unique: mZTUBrC0Pre0QlhpVdCsAQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CEEBF1891E80; Wed, 21 Oct 2020 06:07:56 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-231.sin2.redhat.com [10.67.116.231]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B786955789; Wed, 21 Oct 2020 06:07:53 +0000 (UTC) From: P J P To: Jason Wang Subject: [PATCH v3] net: remove an assert call in eth_get_gso_type Date: Wed, 21 Oct 2020 11:35:50 +0530 Message-Id: <20201021060550.1652896-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gaoning Pan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , QEMU Developers , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit eth_get_gso_type() routine returns segmentation offload type based on L3 protocol type. It calls g_assert_not_reached if L3 protocol is unknown, making the following return statement unreachable. Remove the g_assert call, it maybe triggered by a guest user. Reported-by: Gaoning Pan Signed-off-by: Prasad J Pandit --- net/eth.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Update v3: use LOG_GUEST_ERROR mask and %0x04PRIx16 conversion. -> https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg05759.html -> https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg05752.html -- 2.26.2 diff --git a/net/eth.c b/net/eth.c index 0c1d413ee2..eee77071f9 100644 --- a/net/eth.c +++ b/net/eth.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "net/eth.h" #include "net/checksum.h" #include "net/tap.h" @@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto) return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state; } } - - /* Unsupported offload */ - g_assert_not_reached(); + qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, " + "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto); return VIRTIO_NET_HDR_GSO_NONE | ecn_state; }