From nobody Wed Feb 11 00:56:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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 ARC-Seal: i=1; a=rsa-sha256; t=1682505780; cv=none; d=zohomail.com; s=zohoarc; b=Id+ayI9aQFFa+G6Im6lbzzYcmChmu/eizjV9+pUFffK2YlNeuRKhLM5g2YMgXoH45z4jk+fISodJ/pt/gT6yfL1xcz3OdNfMB9z5kqq69qfeUK+0OGLZfXSwFmKteMWmD+p26WM6d/2up4mN8DyWXpXmWZHRnz17IfE+8hBSB5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682505780; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=8cbPtOGCt4/DtgDNQOMqkazCwuM1SU58VR9lfEcSjFg=; b=h5EtWU/wwn/XtkvWyltixypc09UiKleCsmn0it/NsShZB/B2nRByKzjFX3Cw6K+47E0O8bP94DR8/7QO0Z7lE9FpUkkgXY1uut/5H/lMetE1cpLf7ida6/E382GT2II513p+ZooKCD7bXpEr4u8v10AICnWopMKJhV2uNZw0nrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16825057800251015.880438025585; Wed, 26 Apr 2023 03:43:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prcYW-0005Ae-Hc; Wed, 26 Apr 2023 06:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prcYS-0004v0-KI for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:39:20 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prcYQ-0003K1-Sw for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:39:20 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-63b52ad6311so8219937b3a.2 for ; Wed, 26 Apr 2023 03:39:17 -0700 (PDT) Received: from alarm.u-tokyo.ac.jp ([157.82.194.15]) by smtp.gmail.com with ESMTPSA id m11-20020a63580b000000b0051322a5aa64sm9317919pgb.3.2023.04.26.03.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 03:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1682505557; x=1685097557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8cbPtOGCt4/DtgDNQOMqkazCwuM1SU58VR9lfEcSjFg=; b=hw54M7VBYGISGO3Kt+gmGet5n8z0bODob2Iw8yfaD2FqrLVDuitAsAwn+CqonsXsB/ sUPhl0Tn6o1e8VFoHK2vqZa5qzi5Ky5fq4Gx8Q1uljQEXS0rjcBr0sTvKe4+L4crac07 GxP0ZI1f/YIlmNRInU2JNeeUco/IEnRit92pPdm2DFcaUBe94nzFTSZZvDaeZRhqiaAn ngobLYVaz8QToFManTARnzIE0oxKQ526U4Cc9RBJiAK5Dd6I9n96hzpu1ldEvZ7kATgC 3fU5zKPR1A7UoCWr30YHOFaqWJdiCGHZgrKXTLBL2+HJ39r5mGPQ1dReCKn8wwO1rHyx 1z1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682505557; x=1685097557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8cbPtOGCt4/DtgDNQOMqkazCwuM1SU58VR9lfEcSjFg=; b=QOW7DZZVqkAY2OrA1ZONzOY6iky5m/sYZeLa0dpxkNaWfi16xLAEMJt/RnlQqdJlep hl9REFD2ogChFQ0SxgCXy4N9HWQyoy7M5G5yTTwS67113IqBOMB8ha2wWj7PX/EUzMTY 6p7Q72Dx8Z7xZle+0dwJ/Yb8kjVJMVMn34w80Tft9NfYd+IWt3rH6ivkDZiCN5eqYXW5 gYRhgy3tbjzEV9mmTOmSupT3liftbusx4F/RSFHOc4IWVD0yHZrQOW5x1w5N1Z1JZhsI XRfThHB6x4sNArRkyPEesNtfDoYInTbqLOuMYBktR8mrkepfFpZxA8JJbIAeOnjmc1rM KQoA== X-Gm-Message-State: AC+VfDzSf2brP92nv3YviojzxYlhOCOPq7VOlRy445ajeZ3dqwSsw0Av xWWens4ksP/ebqKoihWW4nrJcw== X-Google-Smtp-Source: ACHHUZ695xuXPN+rCljXR2poYk1E3OjQlT/ZFI/r7mxqbIZoHJzM7aI0953MvDbwJsTqTCMl7eF9cg== X-Received: by 2002:a05:6a20:1606:b0:f6:5a75:7d44 with SMTP id l6-20020a056a20160600b000f65a757d44mr5898263pzj.12.1682505556742; Wed, 26 Apr 2023 03:39:16 -0700 (PDT) From: Akihiko Odaki To: Cc: Sriram Yagnaraman , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Tomasz Dzieciol , Akihiko Odaki Subject: [PATCH v4 32/48] hw/net/net_rx_pkt: Enforce alignment for eth_header Date: Wed, 26 Apr 2023 19:37:00 +0900 Message-Id: <20230426103716.26279-33-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426103716.26279-1-akihiko.odaki@daynix.com> References: <20230426103716.26279-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 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: none client-ip=2607:f8b0:4864:20::42b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1682505780637100002 Content-Type: text/plain; charset="utf-8" eth_strip_vlan and eth_strip_vlan_ex refers to ehdr_buf as struct eth_header. Enforce alignment for the structure. Signed-off-by: Akihiko Odaki Reviewed-by: Sriram Yagnaraman --- hw/net/net_rx_pkt.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 6125a063d7..1de42b4f51 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -23,7 +23,10 @@ =20 struct NetRxPkt { struct virtio_net_hdr virt_hdr; - uint8_t ehdr_buf[sizeof(struct eth_header) + sizeof(struct vlan_header= )]; + struct { + struct eth_header eth; + struct vlan_header vlan; + } ehdr_buf; struct iovec *vec; uint16_t vec_len_total; uint16_t vec_len; @@ -89,7 +92,7 @@ net_rx_pkt_pull_data(struct NetRxPkt *pkt, if (pkt->ehdr_buf_len) { net_rx_pkt_iovec_realloc(pkt, iovcnt + 1); =20 - pkt->vec[0].iov_base =3D pkt->ehdr_buf; + pkt->vec[0].iov_base =3D &pkt->ehdr_buf; pkt->vec[0].iov_len =3D pkt->ehdr_buf_len; =20 pkt->tot_len =3D pllen + pkt->ehdr_buf_len; @@ -120,7 +123,7 @@ void net_rx_pkt_attach_iovec(struct NetRxPkt *pkt, assert(pkt); =20 if (strip_vlan) { - pkt->ehdr_buf_len =3D eth_strip_vlan(iov, iovcnt, iovoff, pkt->ehd= r_buf, + pkt->ehdr_buf_len =3D eth_strip_vlan(iov, iovcnt, iovoff, &pkt->eh= dr_buf, &ploff, &tci); } else { pkt->ehdr_buf_len =3D 0; @@ -142,7 +145,7 @@ void net_rx_pkt_attach_iovec_ex(struct NetRxPkt *pkt, =20 if (strip_vlan) { pkt->ehdr_buf_len =3D eth_strip_vlan_ex(iov, iovcnt, iovoff, vet, - pkt->ehdr_buf, + &pkt->ehdr_buf, &ploff, &tci); } else { pkt->ehdr_buf_len =3D 0; --=20 2.40.0