qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
	Prasad J Pandit <pjp@fedoraproject.org>
Subject: [PULL 12/17] net: remove an assert call in eth_get_gso_type
Date: Wed, 11 Nov 2020 21:11:36 +0800	[thread overview]
Message-ID: <1605100301-11317-13-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1605100301-11317-1-git-send-email-jasowang@redhat.com>

From: Prasad J Pandit <pjp@fedoraproject.org>

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 <pgn@zju.edu.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/eth.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/eth.c b/net/eth.c
index 0c1d413..1e0821c 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_UNIMP, "%s: probably not GSO frame, "
+        "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto);
 
     return VIRTIO_NET_HDR_GSO_NONE | ecn_state;
 }
-- 
2.7.4



  parent reply	other threads:[~2020-11-11 13:25 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-11 13:11 [PULL 00/17] Net patches Jason Wang
2020-11-11 13:11 ` [PULL 01/17] virtio-net: Set mac address to hardware if the peer is vdpa Jason Wang
2020-11-11 13:11 ` [PULL 02/17] net/filter-rewriter: destroy g_hash_table in colo_rewriter_cleanup Jason Wang
2020-11-11 13:11 ` [PULL 03/17] Optimize seq_sorter function for colo-compare Jason Wang
2020-11-11 13:11 ` [PULL 04/17] Reduce the time of checkpoint for COLO Jason Wang
2020-11-11 13:11 ` [PULL 05/17] Fix the qemu crash when guest shutdown in COLO mode Jason Wang
2020-11-11 13:11 ` [PULL 06/17] colo-compare: fix missing compare_seq initialization Jason Wang
2020-11-11 13:11 ` [PULL 07/17] colo-compare: check mark in mutual exclusion Jason Wang
2020-11-11 13:11 ` [PULL 08/17] net/colo-compare.c: Fix compare_timeout format issue Jason Wang
2020-11-11 13:11 ` [PULL 09/17] net/colo-compare.c: Change the timer clock type Jason Wang
2020-11-11 13:11 ` [PULL 10/17] net/colo-compare.c: Add secondary old packet detection Jason Wang
2020-11-11 13:11 ` [PULL 11/17] net/colo-compare.c: Increase default queued packet scan frequency Jason Wang
2020-11-11 13:11 ` Jason Wang [this message]
2020-11-11 13:11 ` [PULL 13/17] net/l2tpv3: Remove redundant check in net_init_l2tpv3() Jason Wang
2020-11-11 13:11 ` [PULL 14/17] hw/net/can/ctucan: Don't allow guest to write off end of tx_buffer Jason Wang
2020-11-11 13:11 ` [PULL 15/17] hw/net/can/ctucan: Avoid unused value in ctucan_send_ready_buffers() Jason Wang
2020-11-11 13:11 ` [PULL 16/17] hw/net/can/ctucan_core: Handle big-endian hosts Jason Wang
2020-11-11 13:11 ` [PULL 17/17] hw/net/can/ctucan_core: Use stl_le_p to write to tx_buffers Jason Wang
2020-11-11 14:55 ` [PULL 00/17] Net patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1605100301-11317-13-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).