From nobody Sun Feb 8 20:51:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619147955; cv=none; d=zohomail.com; s=zohoarc; b=jPCHVFbgHD9JRmpPj1DQAYpQPxJn/rGODDRZ378CZBRVF8/9xdQ+Jxf+Q9ewZiFlwPoXhdPP9YCK6avxK9UowntHkWMcQIOGoH1xebNZl5a9kazXo5CABcN/3ZNXusfy406CP1YcoG6xphQzgsXhWz0FQ8wjWMFHqA7QwVhGQvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619147955; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=xbVL+rALQih5dq/39Ivmk4tFNMWZRph09PoldeHJ3hk=; b=XlIV8qU9rIe/LnhlXs+R6E5KNnFvvR5eI0jCHE5LaXPWwlR9mWKMjNytD6zC5YsDTRthRqUH37lT2gYSyKVTFa4Y1er64mo5iDsK6bJEek0LLAgoxvLuEt0iMiA4iuWF/IQShvTvB8emRPJt7GA/kO4AFTD+d7NjiVq33TyapeA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619147955328541.8041757021872; Thu, 22 Apr 2021 20:19:15 -0700 (PDT) Received: from localhost ([::1]:57088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZmLa-00044y-2i for importer@patchew.org; Thu, 22 Apr 2021 23:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZmKh-0003fl-32 for qemu-devel@nongnu.org; Thu, 22 Apr 2021 23:18:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZmKd-00016o-JN for qemu-devel@nongnu.org; Thu, 22 Apr 2021 23:18:18 -0400 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-355-RSIdX4ouMaCRnE1HyfY2Xg-1; Thu, 22 Apr 2021 23:18:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7492118397A3; Fri, 23 Apr 2021 03:18:09 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-225.pek2.redhat.com [10.72.13.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE4345D9C6; Fri, 23 Apr 2021 03:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619147892; 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=xbVL+rALQih5dq/39Ivmk4tFNMWZRph09PoldeHJ3hk=; b=KAwvu7QdAbMZNyDPZqXIpMhQFM9JiN8EYjmxvAT+vl3IfQ+m4UBTMv/UUkcr9MyLwfb/Vf 7l8yW3og1sjQByglaxzcvpW7VpoS4ChIKQ9NXClzOUPe3uVFh5FBUZC7IXrU5RH3+7Bw/K HmdqIzLmng78PaDmy1V2dzcMnkiE/uA= X-MC-Unique: RSIdX4ouMaCRnE1HyfY2Xg-1 From: Jason Wang To: jasowang@redhat.com, samuel.thibault@ens-lyon.org, sw@weilnetz.de, qemu-devel@nongnu.org Subject: [PATCH for 6.0] net: check the existence of peer before trying to pad Date: Fri, 23 Apr 2021 11:18:03 +0800 Message-Id: <20210423031803.1479-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: peter.maydell@linaro.org, bmeng.cn@gmail.com, philmd@redhat.com, crobinso@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There could be case that peer is NULL. This can happen when during network device hot-add where net device needs to be added first. So the patch check the existence of peer before trying to do the pad. Fixes: 969e50b61a285 ("net: Pad short frames to minimum size before sending= from SLiRP/TAP") Signed-off-by: Jason Wang Reviewed-by: Bin Meng Reviewed-by: Stefan Weil --- include/net/net.h | 5 +++++ net/slirp.c | 2 +- net/tap-win32.c | 2 +- net/tap.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index eff24519d2..1ef536d771 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -241,4 +241,9 @@ uint32_t net_crc32_le(const uint8_t *p, int len); .offset =3D vmstate_offset_macaddr(_state, _field), \ } =20 +static inline bool net_peer_needs_padding(NetClientState *nc) +{ + return nc->peer && !nc->peer->do_not_pad; +} + #endif diff --git a/net/slirp.c b/net/slirp.c index a01a0fccd3..7a4e96db5c 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -119,7 +119,7 @@ static ssize_t net_slirp_send_packet(const void *pkt, s= ize_t pkt_len, uint8_t min_pkt[ETH_ZLEN]; size_t min_pktsz =3D sizeof(min_pkt); =20 - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, pkt, pkt_len)) { pkt =3D min_pkt; pkt_len =3D min_pktsz; diff --git a/net/tap-win32.c b/net/tap-win32.c index 897bd18e32..6096972f5d 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -696,7 +696,7 @@ static void tap_win32_send(void *opaque) if (size > 0) { orig_buf =3D buf; =20 - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf =3D min_pkt; size =3D min_pktsz; diff --git a/net/tap.c b/net/tap.c index 7d53cedaec..820872fde8 100644 --- a/net/tap.c +++ b/net/tap.c @@ -203,7 +203,7 @@ static void tap_send(void *opaque) size -=3D s->host_vnet_hdr_len; } =20 - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf =3D min_pkt; size =3D min_pktsz; --=20 2.25.1