From patchwork Tue Oct 20 14:00:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11847069 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 498BC15E6 for ; Tue, 20 Oct 2020 14:04:42 +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 93F2322249 for ; Tue, 20 Oct 2020 14:04:41 +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="VywGDImw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93F2322249 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]:41960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUsFj-0005wc-T1 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Oct 2020 10:04:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUsEF-0004wn-JC for qemu-devel@nongnu.org; Tue, 20 Oct 2020 10:03:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUsEB-0005Jp-6D for qemu-devel@nongnu.org; Tue, 20 Oct 2020 10:03:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603202580; 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=pW6yhvOhAl9Ztm+8ZeD4dGC8wSUvMZMPSwt1ok2woCU=; b=VywGDImw58cZvrBm0/uyV8RSBSXlmLaTIi4Ep3MzKQpl0QshlINe+uHlcSOIc3FH2shQ78 v4fzjR5gmLdAjm8L0AF6q7ZpbLxCLzBqc/nwxbuiVOsAb5r1MVMu736QJgW0CoTDIdon1Q xHsq3sj2AzQGfW83GX0uX4tAz2qfDWc= 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-291-NqEqJX-OMS-q8KES_hUFsg-1; Tue, 20 Oct 2020 10:02:57 -0400 X-MC-Unique: NqEqJX-OMS-q8KES_hUFsg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F0EF8049D3; Tue, 20 Oct 2020 14:02:56 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-157.phx2.redhat.com [10.3.112.157]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEF216EF41; Tue, 20 Oct 2020 14:02:53 +0000 (UTC) From: P J P To: Jason Wang Subject: [PATCH v2] net: remove an assert call in eth_get_gso_type Date: Tue, 20 Oct 2020 19:30:50 +0530 Message-Id: <20201020140050.1623109-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=216.205.24.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 01:16:16 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_H4=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: 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, as it maybe triggered by a guest user. Reported-by: Gaoning Pan Signed-off-by: Prasad J Pandit Reviewed-by: Philippe Mathieu-Daudé --- net/eth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Update v2: add qemu_log() -> https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg05576.html -- 2.26.2 diff --git a/net/eth.c b/net/eth.c index 0c1d413ee2..fd76e349eb 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,7 @@ 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("Probably not GSO frame, unknown L3 protocol: %hd\n", l3_proto); return VIRTIO_NET_HDR_GSO_NONE | ecn_state; }