From nobody Sat Jul 25 08:04:50 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1784719533; cv=none; d=zohomail.com; s=zohoarc; b=WE1yiPPH4EykxRleI7jUoI4gKZnFCOEec380Hxvu5yZRH6iHDQ71mXKP6EF7UMbIxdefAiNPMCcFmrwteVsKxdiT9n/qAKyZDKH2lnmALsJnR5lGhuHPBBiTrO+XovAYWuye+tXroO1HaciyEap4VdMFMjY8JLL3gnomPMIt05k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784719533; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xTXbPGjY1+bQiM/reVOT9vL1o1GJWS55v/PGrJ2mhzU=; b=HSj9yEbvDpcC/QQMPW3VX8JywdjE8kcLQtWecPriw5ANV3eF1T7+lscDJsbAPR4AR5dwLzzQBKcdsnJxUcZyAVXf1ETnnaDRLqal4sLOeJ0+JpZDP1UL3NlZncDqxpt9Fe1G83eAsdI1gCJnJHaejoQO17gOeOb03FplUqz1450= 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784719533267458.01474983438084; Wed, 22 Jul 2026 04:25:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wmV4U-0006Kb-N5; Wed, 22 Jul 2026 07:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmV4R-0006GO-UF for qemu-devel@nongnu.org; Wed, 22 Jul 2026 07:25:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmV4Q-0005qV-8k for qemu-devel@nongnu.org; Wed, 22 Jul 2026 07:25:03 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-T2gy-bNfMm278SyIUFuDOA-1; Wed, 22 Jul 2026 07:24:57 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D5ED21800668; Wed, 22 Jul 2026 11:24:55 +0000 (UTC) Received: from lenovo-t14s.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CFDA81800626; Wed, 22 Jul 2026 11:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784719501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTXbPGjY1+bQiM/reVOT9vL1o1GJWS55v/PGrJ2mhzU=; b=AbMjHaTMr4yGo939K9+mSftdno160XV/WtYRNyK8CMLA1SR/mUp9I+wvVM6y1GII3166UQ wtREedIzhRTWOeUmVzPWfnvDA1YjE8nkiuZiGD9up6BXIARirTgfbUGnpCtxGsQax5FjG1 yrtlumShEqyRy99NtuwvcV8hJIadrto= X-MC-Unique: T2gy-bNfMm278SyIUFuDOA-1 X-Mimecast-MFC-AGG-ID: T2gy-bNfMm278SyIUFuDOA_1784719496 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Sriram Yagnaraman , Dmitry Fleytman , Jason Wang , Akihiko Odaki , Laurent Vivier , qemu-stable@nongnu.org Subject: [PATCH v2 1/2] hw/net/e1000e: recalculate rx_desc_len on migration load Date: Wed, 22 Jul 2026 13:24:48 +0200 Message-ID: <20260722112449.1386162-2-lvivier@redhat.com> In-Reply-To: <20260722112449.1386162-1-lvivier@redhat.com> References: <20260722112449.1386162-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_H2=-0.01, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=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: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1784719535978158500 Content-Type: text/plain; charset="utf-8" rx_desc_len is migrated as a raw uint8_t from the stream, but it is a derived value that can be computed from the register state in core.mac[RFCTL] and core.mac[RCTL]. A crafted migration stream can set rx_desc_len to an invalid value (e.g. 64), causing a stack buffer overflow in e1000e_write_packet_to_guest() which copies rx_desc_len bytes into a 32-byte stack union. Recalculate rx_desc_len and other derived values from the register state in post_load, ignoring the untrusted values from the stream. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3869 Signed-off-by: Laurent Vivier Reviewed-by: Akihiko Odaki --- hw/net/e1000e_core.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 46e156a5ddc2..b87a9f167a71 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1948,6 +1948,16 @@ e1000e_calc_rxdesclen(E1000ECore *core) trace_e1000e_rx_desc_len(core->rx_desc_len); } =20 +static void +e1000e_calc_rxconf(E1000ECore *core) +{ + e1000e_parse_rxbufsize(core); + e1000e_calc_rxdesclen(core); + core->rxbuf_min_shift =3D + ((core->mac[RCTL] / E1000_RCTL_RDMTS_QUAT) & 3) + 1 + + E1000_RING_DESC_LEN_SHIFT; +} + static void e1000e_set_rx_control(E1000ECore *core, int index, uint32_t val) { @@ -1955,11 +1965,7 @@ e1000e_set_rx_control(E1000ECore *core, int index, u= int32_t val) trace_e1000e_rx_set_rctl(core->mac[RCTL]); =20 if (val & E1000_RCTL_EN) { - e1000e_parse_rxbufsize(core); - e1000e_calc_rxdesclen(core); - core->rxbuf_min_shift =3D ((val / E1000_RCTL_RDMTS_QUAT) & 3) + 1 + - E1000_RING_DESC_LEN_SHIFT; - + e1000e_calc_rxconf(core); e1000e_start_recv(core); } } @@ -3557,5 +3563,7 @@ e1000e_core_post_load(E1000ECore *core) e1000e_intrmgr_resume(core); e1000e_autoneg_resume(core); =20 + e1000e_calc_rxconf(core); + return 0; } --=20 2.54.0 From nobody Sat Jul 25 08:04:50 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1784719533; cv=none; d=zohomail.com; s=zohoarc; b=INIwMShZj6pCOGEqek0RW5DRXTVKAZRapigChJ4j6z0JI6x97AYC6AB42Xuh8JasI7AuCuQxg4HKpz3qsKcNcCRae+YfZv7EVmCt+aNM8leKI7vlvwlNclb+cqoksgfCQXcnsruNEMGpuN59M2dEcTMAmd+YQbFvh8kN6S09dlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784719533; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OwIMjyFIP+qlwdPkq7veT0IMBIvjr7F/c9zAWO1v/7c=; b=Q9O451Ay2XBxQy4GNzytHMAroSRPzU9oP/kmg7J01C/pae26Ryy3seZTls5KwkFiq4iR6U/XtOimqfOFBF6rdR9b4h2Oxuj/y0EMe4ktjfy0DLrOSGVjU1hnB+W6o0QXYhRPIS7Wr6SgnF/9PFf21XkOBIpq0F0ha4LWywywzgg= 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784719533028113.7705447684948; Wed, 22 Jul 2026 04:25:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wmV4X-0006Ql-6X; Wed, 22 Jul 2026 07:25:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmV4T-0006Ju-Pv for qemu-devel@nongnu.org; Wed, 22 Jul 2026 07:25:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wmV4S-0005qj-CX for qemu-devel@nongnu.org; Wed, 22 Jul 2026 07:25:05 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-5Otf1zOAOIO_GYmm7qExQw-1; Wed, 22 Jul 2026 07:25:00 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54A0B197750F; Wed, 22 Jul 2026 11:24:58 +0000 (UTC) Received: from lenovo-t14s.redhat.corp (headnet03.pony-001.prod.iad2.dc.redhat.com [10.2.32.114]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58C541800626; Wed, 22 Jul 2026 11:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784719503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OwIMjyFIP+qlwdPkq7veT0IMBIvjr7F/c9zAWO1v/7c=; b=PGr8o5WIAwQvZ8iSpr8t4xR6DOlbqCs8SomXzt5CWMHvtmaMTyR05lzhymlyOIG5s71SLU AMs5OTEV3QwOGVczpQj3kilEDTqWzeehglcDVN2U7BaD+iOZ6HypiE4WJEp8zy8dNF8eav isfBvffYDK6NU5cfykykRsgSundn3Ls= X-MC-Unique: 5Otf1zOAOIO_GYmm7qExQw-1 X-Mimecast-MFC-AGG-ID: 5Otf1zOAOIO_GYmm7qExQw_1784719498 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Sriram Yagnaraman , Dmitry Fleytman , Jason Wang , Akihiko Odaki , Laurent Vivier , qemu-stable@nongnu.org Subject: [PATCH v2 2/2] hw/net/igb: recalculate rx_desc_len on migration load Date: Wed, 22 Jul 2026 13:24:49 +0200 Message-ID: <20260722112449.1386162-3-lvivier@redhat.com> In-Reply-To: <20260722112449.1386162-1-lvivier@redhat.com> References: <20260722112449.1386162-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: permerror client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_H2=-0.01, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1784719535957158500 Content-Type: text/plain; charset="utf-8" rx_desc_len is migrated as a raw uint8_t from the stream but is a derived value. Currently igb_rx_use_legacy_descriptor() is a stub that always returns false, so rx_desc_len is always set to sizeof(union e1000_adv_rx_desc). Recalculate it in post_load to prevent a crafted migration stream from setting an invalid value. Cc: qemu-stable@nongnu.org Signed-off-by: Laurent Vivier Reviewed-by: Akihiko Odaki --- hw/net/igb_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 45d8fd795b84..2a4883907353 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -4548,5 +4548,7 @@ igb_core_post_load(IGBCore *core) igb_intrmgr_resume(core); igb_autoneg_resume(core); =20 + igb_calc_rxdesclen(core); + return 0; } --=20 2.54.0