From patchwork Thu Nov 7 16:32:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 841392 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp1175790wru; Thu, 7 Nov 2024 08:33:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVWU2UgLCHfnw1E/DmajMQ8oCgxoBnHM2G6UpV3G1x7sGjGUkCBkB15SwlgW6DcdGlFYqU9bQ==@linaro.org X-Google-Smtp-Source: AGHT+IF629vBaq43rUZ/jPqYNRgkYJvoqvKjheaWs3ILjOLX6zoiuuh3Ap5bKPc6iH4x5/kItEHm X-Received: by 2002:a05:6358:5d81:b0:1c3:94:8fe3 with SMTP id e5c5f4694b2df-1c5f98c4b7cmr1197854655d.4.1730997191417; Thu, 07 Nov 2024 08:33:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730997191; cv=none; d=google.com; s=arc-20240605; b=DnXHj9h9/tpvjIaKZu3jxkUJrOSBC9UM1KisDlU6jMc7byLjnvIrNyCLee0e6N9YHp eMSRxjeCS0IcDxFJEkJRQ7uwnqWBtsPv1wPLdQ72rH8RT7ho2yjcOxlMAbYKD1poycDa Nj9bTRU/LBXfqU/tXXi0aTPq/998nnuFcP4YFae0JHgghORgv42RoA8UMfaaVL/+q9WW 74FEfLFoqJWwYy7gcNmuUo0IJUG5iaRxKE54coESUdnnE2EInZNW/tXir3FWvDSxyZ4C ee0tt/h70eM27JscWTGf65dNEw02kVg2jhlRTw6XjpKkcFkOAbveWiE3JdSSuLMZI20H 69LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1WMn0gaL6wgiSUyaLJnx1vDmLwUkpAicF45c17E4Yr8=; fh=06tYIYiw4k76DwX6y6PMAG3JOzElYsDZG0fOLtR5pVA=; b=VY+RHBO2Y6yB8M7UJsP5eamp06qVVXUeMMA6QNFeWseHW8BXGTZfjGmD4Csyn26kTD pHblMC4a0v1IRu7lLOnvEJ5BI/p1TrqgvOFCklyVNS3pW1hg0dpip1UQyZKTI3FhBhpw 0uIa2GlXycUh+iLExMqyZQtdONZDgGP0XiNYrH0v9/4TAj9ATurTKsYsIfMcq2LuZbCf QELUzpvO7bHkMlabE4bnKak0ZFCvm7hAkshXvzVRphB+I+9YqviGRVeJLq5Zqwi3snHv kZJsMk206arKGwUsl34hvhLys1HP2TYzuHZMbL/ugjZmmpYYMtxHD8JX82GK/MH3JRA5 N6VQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPQLQaPE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a1e0cc1a2514c-85655521cbfsi431966241.4.2024.11.07.08.33.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Nov 2024 08:33:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPQLQaPE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t95Qj-0007z1-Ff; Thu, 07 Nov 2024 11:32:21 -0500 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 1t95Qf-0007xg-UQ for qemu-devel@nongnu.org; Thu, 07 Nov 2024 11:32:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t95Qc-00049A-9w for qemu-devel@nongnu.org; Thu, 07 Nov 2024 11:32:17 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4315df7b43fso9905195e9.0 for ; Thu, 07 Nov 2024 08:32:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730997132; x=1731601932; darn=nongnu.org; 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=1WMn0gaL6wgiSUyaLJnx1vDmLwUkpAicF45c17E4Yr8=; b=OPQLQaPE6OvhLw/xhCv8puflQ5mxywR1+3LnApsO6r3duRmoh6MNmSN7GdSLhwbZUQ wiBUHMEIbkjPFzl2aC2nGOZKGJeF8/UQUm/fU59Wx4SRrJkIOhguOdNjEkCE6FrIRuPE rqDrA0GpBtXR1DnZZbTW6etCWbBOuB+zkFDHBo2at6309bJVqpwIn7xine1wdklccNs6 F2i3iFG/56oDeCOptGxQtFFAf05mNWP58uUlHxmfKtiRcNKGLBijrREX5/JowwN2ZS4q BGxkKuIkWOXSiv3DUn7lF050GHEPYSubdozs4DKoVObcd1aKY+ETZmD/IyTHgw1femV6 BIMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730997132; x=1731601932; 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=1WMn0gaL6wgiSUyaLJnx1vDmLwUkpAicF45c17E4Yr8=; b=Q8GzOZydVGI4qntVDe1yrrO62Rp4UtXq5N+oHvSbn3h/FvCt40rymrKUZZdfmkLSdI OopKpqDIF0YxOOa6Q07tTooipu+HRi0fXZCbketu5XZg13bHnKdRbjuSVwHGaBqPbN1j cAm9tGfSXQoTOjJtRJl1taKcEKh/dAwB1+MqLpLW0s3jiSmi+224Ckjv0HdFYeZsPGX9 KqA+CIRoL76EPh4uLZw2xp6A43cf/5jrN6ch6IVvgM1utlCe45fR0B+EMJ94qVpjkdFr +eMz8QI63DenSdZQES/gMCWvBtF/DB8yOHrLPYB3XADNYTtuvUwLQHqDSI06inrAZWRB xP5Q== X-Gm-Message-State: AOJu0Yw15HKzquGj8RjztOswt9U5m37m5IhwN3prtf840DeC6aV8VHH4 lcHA4wkEtLoOUmgcHkFmw2MMUNeI4VDtA+nnP2EigwBfgkZ26tJVLjiRpBUd7PLea6Q2kATFwgg r X-Received: by 2002:a05:600c:281:b0:431:3933:1d30 with SMTP id 5b1f17b1804b1-431a0c3b8f4mr374746315e9.5.1730997132619; Thu, 07 Nov 2024 08:32:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed9ea587sm2185161f8f.78.2024.11.07.08.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 08:32:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Jason Wang , Dmitry Fleytman , Akihiko Odaki Subject: [PATCH 1/2] hw/net/virtio-net.c: Don't assume IP length field is aligned Date: Thu, 7 Nov 2024 16:32:09 +0000 Message-Id: <20241107163210.3620697-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107163210.3620697-1-peter.maydell@linaro.org> References: <20241107163210.3620697-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In virtio-net.c we assume that the IP length field in the packet is aligned, and we copy its address into a uint16_t* in the VirtioNetRscUnit struct which we then dereference later. This isn't a safe assumption; it will also result in compilation failures if we mark the ip_header struct as QEMU_PACKED because the compiler will not let you take the address of an unaligned struct field. Make the ip_plen field in VirtioNetRscUnit a void*, and make all the places where we read or write through that pointer instead use some new accessor functions read_unit_ip_len() and write_unit_ip_len() which account for the pointer being potentially unaligned and also do the network-byte-order conversion we were previously using htons() to perform. Signed-off-by: Peter Maydell --- include/hw/virtio/virtio-net.h | 2 +- hw/net/virtio-net.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 060c23c04d2..b9ea9e824e3 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -102,7 +102,7 @@ typedef struct VirtioNetRscStat { /* Rsc unit general info used to checking if can coalescing */ typedef struct VirtioNetRscUnit { void *ip; /* ip header */ - uint16_t *ip_plen; /* data len pointer in ip header field */ + void *ip_plen; /* pointer to unaligned uint16_t data len in ip header */ struct tcp_header *tcp; /* tcp header */ uint16_t tcp_hdrlen; /* tcp header len */ uint16_t payload; /* pure payload without virtio/eth/ip/tcp */ diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index f2104ed364a..11cf462180d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2049,6 +2049,21 @@ static ssize_t virtio_net_do_receive(NetClientState *nc, const uint8_t *buf, return virtio_net_receive_rcu(nc, buf, size, false); } +/* + * Accessors to read and write the IP packet data length field. This + * is a potentially unaligned network-byte-order 16 bit unsigned integer + * pointed to by unit->ip_len. + */ +static uint16_t read_unit_ip_len(VirtioNetRscUnit *unit) +{ + return ldl_be_p(unit->ip_plen); +} + +static void write_unit_ip_len(VirtioNetRscUnit *unit, uint16_t l) +{ + stl_be_p(unit->ip_plen, l); +} + static void virtio_net_rsc_extract_unit4(VirtioNetRscChain *chain, const uint8_t *buf, VirtioNetRscUnit *unit) @@ -2063,7 +2078,7 @@ static void virtio_net_rsc_extract_unit4(VirtioNetRscChain *chain, unit->ip_plen = &ip->ip_len; unit->tcp = (struct tcp_header *)(((uint8_t *)unit->ip) + ip_hdrlen); unit->tcp_hdrlen = (htons(unit->tcp->th_offset_flags) & 0xF000) >> 10; - unit->payload = htons(*unit->ip_plen) - ip_hdrlen - unit->tcp_hdrlen; + unit->payload = read_unit_ip_len(unit) - ip_hdrlen - unit->tcp_hdrlen; } static void virtio_net_rsc_extract_unit6(VirtioNetRscChain *chain, @@ -2082,7 +2097,7 @@ static void virtio_net_rsc_extract_unit6(VirtioNetRscChain *chain, /* There is a difference between payload length in ipv4 and v6, ip header is excluded in ipv6 */ - unit->payload = htons(*unit->ip_plen) - unit->tcp_hdrlen; + unit->payload = read_unit_ip_len(unit) - unit->tcp_hdrlen; } static size_t virtio_net_rsc_drain_seg(VirtioNetRscChain *chain, @@ -2231,7 +2246,7 @@ static int32_t virtio_net_rsc_coalesce_data(VirtioNetRscChain *chain, VirtioNetRscUnit *o_unit; o_unit = &seg->unit; - o_ip_len = htons(*o_unit->ip_plen); + o_ip_len = read_unit_ip_len(o_unit); nseq = htonl(n_unit->tcp->th_seq); oseq = htonl(o_unit->tcp->th_seq); @@ -2267,7 +2282,7 @@ coalesce: o_unit->payload += n_unit->payload; /* update new data len */ /* update field in ip header */ - *o_unit->ip_plen = htons(o_ip_len + n_unit->payload); + write_unit_ip_len(o_unit, o_ip_len + n_unit->payload); /* Bring 'PUSH' big, the whql test guide says 'PUSH' can be coalesced for windows guest, while this may change the behavior for linux