From nobody Sat Jul 25 09:32:08 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=1784632316; cv=none; d=zohomail.com; s=zohoarc; b=M1sUae3N2r4Uod9vBPc5H2jkh+3Lr+eUgXgqiaQcn18PH9pQgXlDJ83cGueLWh5glhJ2XtjaKIj+6QpXz0NQJFp/EUaOdG0Eith6jKl4q5MjkZoWtaWUP1SaGZS1LzN5/3vkBe0xkEtL1d8379KPX2imayxm5U9bkleaQXw+Ed0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784632316; 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=ZK6AnypM97aDxjVSX30jqXtov2MbtMD4IrTrgny5K20=; b=Kp7jxDSsLdoOKlQ92RhnMmsOqCrY389gwc55vrzw+XWdMWYtWGyjUsjbE+O14eArT3M93dKzQ5LOMV/QbScWXYXWObkDJQUtmhQ8F7S0Dr6iDypjjodIgucDKxz1fd33QobQTqjDQxd8YshiTW1p7zaH4anP0KjwK1VjKOGPKgw= 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 1784632316328745.7298984053557; Tue, 21 Jul 2026 04:11:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm8Nw-0000TD-Tx; Tue, 21 Jul 2026 07:11:40 -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 1wm8Nv-0000Sg-BQ for qemu-devel@nongnu.org; Tue, 21 Jul 2026 07:11:39 -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 1wm8Nu-0008Uq-0N for qemu-devel@nongnu.org; Tue, 21 Jul 2026 07:11:39 -0400 Received: from mx-prod-mc-01.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-207-Ot6fN50pMwupYaFJjwXPUg-1; Tue, 21 Jul 2026 07:11:34 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 577AF1956056; Tue, 21 Jul 2026 11:11:32 +0000 (UTC) Received: from lenovo-t14s.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 248811599; Tue, 21 Jul 2026 11:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784632297; 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=ZK6AnypM97aDxjVSX30jqXtov2MbtMD4IrTrgny5K20=; b=Lvim/SYoyw49wlBTqHqfpSls9HiXep8meXzWogzD+MEUkpFI0Ng6UmP78rnuGA7PlfpEm6 1+vr93X6ZSbwJEKX8y/r2wCyZaJhtcHF9H4bN67v9uXOQi2f/qkRbNjslhvsEGJQpUikQW pYUyXtcWooXffRWEclp52OKh0S7d+HU= X-MC-Unique: Ot6fN50pMwupYaFJjwXPUg-1 X-Mimecast-MFC-AGG-ID: Ot6fN50pMwupYaFJjwXPUg_1784632292 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Dmitry Fleytman , Jason Wang , Sriram Yagnaraman , Akihiko Odaki , Laurent Vivier , qemu-stable@nongnu.org Subject: [PATCH 1/2] hw/net/e1000e: recalculate rx_desc_len on migration load Date: Tue, 21 Jul 2026 13:11:25 +0200 Message-ID: <20260721111126.3278244-2-lvivier@redhat.com> In-Reply-To: <20260721111126.3278244-1-lvivier@redhat.com> References: <20260721111126.3278244-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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: 1784632318745158500 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[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 from the register state in post_load, ignoring the untrusted value from the stream. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3869 Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/e1000e_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 46e156a5ddc2..31eb39e4aa40 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -3557,5 +3557,7 @@ e1000e_core_post_load(E1000ECore *core) e1000e_intrmgr_resume(core); e1000e_autoneg_resume(core); =20 + e1000e_calc_rxdesclen(core); + return 0; } --=20 2.54.0 From nobody Sat Jul 25 09:32:08 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=1784632329; cv=none; d=zohomail.com; s=zohoarc; b=UEx25K3LCmReURMoDR8ftk0OIhYbjrxaUiv+gaPPViDJ6sR/Aj5vCguTUd4+9NsVhsG2zMhZlX5kb3Pen5GPustIJjBOlQV7uRZW2UslrCouRz96jyAca8mbwMVVQHATq+vnuRKdQYhckH5svbUXvWc8DGxSyDjk+0K35q3EyNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784632329; 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=HNTAABDOZtWY1Q1R8G5kMgHzvN7FJpupzAHEML/h8A4=; b=GApW7CPPljMzLO5OP4j0Z0sAeCFn1N0gjwPoQ545QDItjeftR2asuIwd2zhqKyCPatGEz2QrRxELrIYNx0nut1FOUf2Hlp0gtrrMwcltHOTn55LpW+uYxr2qsBGQ2RNOF+24a1ZvFQ5+ry5/hNteE3xxM5mkTcZ60sSmQstzmwk= 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 1784632329007839.7159351813635; Tue, 21 Jul 2026 04:12:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm8Nx-0000TG-0Y; Tue, 21 Jul 2026 07:11:41 -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 1wm8Nv-0000So-Iu for qemu-devel@nongnu.org; Tue, 21 Jul 2026 07:11:39 -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 1wm8Nu-0008Ut-8Y for qemu-devel@nongnu.org; Tue, 21 Jul 2026 07:11:39 -0400 Received: from mx-prod-mc-08.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-111-08e4cYRLOVuo-A-3HKyH4A-1; Tue, 21 Jul 2026 07:11:36 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C01A61809CA6; Tue, 21 Jul 2026 11:11:34 +0000 (UTC) Received: from lenovo-t14s.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AD43F42B; Tue, 21 Jul 2026 11:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784632297; 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=HNTAABDOZtWY1Q1R8G5kMgHzvN7FJpupzAHEML/h8A4=; b=LFmgFOMhx18DkicG0um5JRLqkhfYPfpvOgIbC2VKjhH4ZR2Jb/lxFqgDbnKZF6tPhYf/rq 4Gu9Xk7MFRj2mli5XCkiL0SGu+TSCRKy1MJyBn7/L6L5L7UfyN0v+YzpQOm7tF5da1O+UF dlAn3NGhl3ZHUEhMktir/9YNV1tzo7I= X-MC-Unique: 08e4cYRLOVuo-A-3HKyH4A-1 X-Mimecast-MFC-AGG-ID: 08e4cYRLOVuo-A-3HKyH4A_1784632294 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Dmitry Fleytman , Jason Wang , Sriram Yagnaraman , Akihiko Odaki , Laurent Vivier , qemu-stable@nongnu.org Subject: [PATCH 2/2] hw/net/igb: recalculate rx_desc_len on migration load Date: Tue, 21 Jul 2026 13:11:26 +0200 Message-ID: <20260721111126.3278244-3-lvivier@redhat.com> In-Reply-To: <20260721111126.3278244-1-lvivier@redhat.com> References: <20260721111126.3278244-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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: 1784632333084158500 Content-Type: text/plain; charset="utf-8" Same issue as e1000e: rx_desc_len is migrated from the stream but can be computed from the register state. 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: Philippe Mathieu-Daud=C3=A9 --- 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