From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630457; cv=none; d=zohomail.com; s=zohoarc; b=kkfACfXnvhGPyMhvGB+F9/z0IyJJADW6igpq9fz7FhRbIDhyW6CyVlc25mEtsHnUQFujnj6Doekzah+fUC1Rx4gipocBXBp+CAZPgIWrboZ2Rs+t5i89KGKhTjFyTcZ5jjLSwWMAQo0fgqxX0M6UAuUPkyp/1dDr5fDhA06ZOb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630457; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=W9orFn3JcygZsqjm/wuUrr1jCHtahYzJU1UXC1wLtoE=; b=HtxbfIDtlpTdkO0Xf+u54L850KeKPEJ7zrQaEijHVp64D0DEyar9EK2NC9AZsJ29iCL6QFV2tmJp7RtbdirSy0aTRxjYngRJBsH2dbji0VtQpLzY3Pm09TCNURsTO6JdniEgO+zng9u5hYbtYPW81z3nBRnHQYjspPyT7mnawXk= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630457959267.55264961427883; Tue, 21 Jul 2026 03:40:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7tb-00061g-8R; Tue, 21 Jul 2026 06:40:19 -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 1wm7ta-00061Q-1n for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:18 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7tY-00034y-BX for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:17 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LAR81H1349447 for ; Tue, 21 Jul 2026 10:40:15 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj6pa84v1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:14 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51bf321d786so98358261cf.1 for ; Tue, 21 Jul 2026 03:40:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63e49acesm36498459f8f.6.2026.07.21.03.40.12 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= W9orFn3JcygZsqjm/wuUrr1jCHtahYzJU1UXC1wLtoE=; b=CKDGRvL/+EEGTi0F dwi6F7854QsBIWL0lSFI3FmFVzvA5u8Rnv2d6Kow7mDBZFZUL0MMfzdGw66rKtEh JFYtCd/8f2nA3cK//vIsHYphTdFNN9QsQFd9OF97Ze54SHFxh0ffgt1zHNqMNFoD /Pf26/SfP29sHkxiUtPgs5OPBOjvNIZvzGlimJSKdMXPAYR8uDlvyPzmzrXke5O1 Glwoae3swoK2s7v428v6tdkdeOVk95m72+UM2lAfC+Sk3537PzjnqvWf4wRbczxW CWKMUufs91duJXcgVFQBzCNCvYW09udwKEd9B9DECoCwdoMNC6MYEdVZFAAR7Xj/ 6tMGKQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630414; x=1785235214; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=W9orFn3JcygZsqjm/wuUrr1jCHtahYzJU1UXC1wLtoE=; b=ZuuWRCFkEnWPQKoXh09RrMuogJX2Uy9uj9wmHpSQNlfve86U3XOYuvBk4VPrjLOIWB VfToPmQZI1RSb6TVmN7Za+OjrtV6Us9bgbc6730vwWlb+2avfvxa1yFFn1qgVx6wxi16 s23Ec5vi4Y/nMdeEkDeuapIUC9brESJAfKUU7klHl5c47dGTTIOGRpz2UWgtTb50aIUo NQJDfKOyCL1nOknIVm05rcBwa3PplaOoF6X7A40bXSS2Vs+Zh81hTFUggEnsF2nwzDLa Zims86UrO4UDpckHMeHk8bkX+uV4vO6dIbe3mL1+eiHFJ3KmFZZ+R4ADg5sPZkjrWTxg a0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630414; x=1785235214; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=W9orFn3JcygZsqjm/wuUrr1jCHtahYzJU1UXC1wLtoE=; b=oaLrbjYfLNH32toxNI4r0qmu3mizVJNsuirLZCukMACHv2fb9mp161EGG8Y7tRfZqU Bz65hiA8xPosKunsQJYMQSkWcv6LJNhAfhs6XKvSZcDlBFDttNTp3InTF1Jv2/MoAGhi mNslso1MUZLF8RRKXtN7WrMz7Yvz1/5Lm1qK3M6kejtwMDNkSIDQY1tTdDogGLZqvJm/ ijqtr/S2/kJ5Xfp9XPZ6TdDHO5c1tq9HHxhcdaRqV3lrTRTNFLyXLoeXAuO2pz88xpOt mqUmNcHaTLtiXb9ZSEXytTG7gPQSrx79RTcQkyg6S3PSDEUVz+h80AwzyQR9IsWRpbKF SIlQ== X-Gm-Message-State: AOJu0YzfpbJ3Rj4+C6v9acrQ2f17BRB9t2SUDG4coNvfHnLu0Cjy42va 1fTCr7rHiybwdE/q01kKLxudT5mcABSaP2ROSaV8Am9vzzr0NFFmfYO/rzLx1H/+USKKLI/Hqmi vdFcnoG0Rn8x5g7frFPzQ6Cu3KGMe8OElUuxW1Clir89KgapXv8A9/UWzRhfNx3iBrw== X-Gm-Gg: AfdE7cl54Un8Ch0xGqwGHogJRH+5lNlz9i52FlObgMyQJyHX42Tzy8iG1YN1Tj2WRK7 RJWyEyviW2T59pZRVXHisucaJSfdzt1SBFfrVRTh/y27NnGYZCmEgvdTdxJ+1bF2yH0tprBZ43S Wnx5huvkpW3nU6rOpJ3SAg0knsurL98RKqgMWuMBBKCIB/MJasbuw3gGEX5EL6aQfi3UmCc31WC a9RFX18Vv2waDr0Y+4AVETNOCzZ06mxa32ljyEBh/IuyciLA8Bxv3UncQQLIi/bWESc7k4/RMzr D8ybFv3LfDQaqVTVuOTOnvIqRpEYayq9cVWhT6RZtMjQ/xI9DaiiDGDYs1jxiiJixI0V7I4Nb7I Tic0xQIX/6fc9d4JJv2DA+qjSGUZTwlvS9Ys4WXIzephGUmSWxr5eU04czQ== X-Received: by 2002:ac8:570f:0:b0:51b:f340:d2be with SMTP id d75a77b69052e-5213e48bcdfmr168057621cf.53.1784630414098; Tue, 21 Jul 2026 03:40:14 -0700 (PDT) X-Received: by 2002:ac8:570f:0:b0:51b:f340:d2be with SMTP id d75a77b69052e-5213e48bcdfmr168057401cf.53.1784630413606; Tue, 21 Jul 2026 03:40:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 1/9] net: Correct padding check in qemu_receive_packet() Date: Tue, 21 Jul 2026 12:39:56 +0200 Message-ID: <20260721104004.84934-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Joo-fI3rKWIvvh8n6CsmnvEGCibyP1SY X-Proofpoint-ORIG-GUID: Joo-fI3rKWIvvh8n6CsmnvEGCibyP1SY X-Authority-Analysis: v=2.4 cv=eYYNubEH c=1 sm=1 tr=0 ts=6a5f4c8e cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=KKAkSRfTAAAA:8 a=69wJf7TsAAAA:8 a=pGLkceISAAAA:8 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=Ys89CfVQ5-dVtwXYUXMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=cvBusfyB2V15izCimMoJ:22 a=Fg1AiH1G6rFz08G2ETeA:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX3Oi2GniKGdAH nr6gw0xxfOzRomZ2/0TYksyP14f4YR2udW4KLKly0gmiuotug9Ik6AIhA9ny19pwY4NAB5MiGlD rnRZUYdLStsV4AKV9vXlfXe7x3pMIo1KIt5A1MDNqRQHmMQYiFHRHX3uSFE9fa+5/S+abKqKvxB dSyPk6rx348A+3IBS6RIKQhfWVMM+D2Wm2Li7XAIEn6cnUcbg0nnxNgSmf/Wxw6kmCj7gg90Brb TKad6sVCBsbwKVcp38n9Osy+VhhaiG34O2RfTOn99je82mDekUHExx1PJYwuaamb+aS+r0VTavr 0v/G8kVq7owlTjIObZRlYRAtyfIulpT/6zFKvPXqW+8LbY1n2a0jalTanAcjCTAwFrIR0qCyHxo GgAR9vsg91+oZos2cK5Y2qMBrcPCMmJdh10qtDOm5c1x8DUADndxGOBjKds9Rn5Ry4bsvxeNycL QrcG37dkI+vdTjPC3tw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX8hgRz1jaghoX BBPrOsE0KIcnkhocXYJ1BK3+YgUNNqlRrvWp0aGXBB4GnOXPeT/WMrIrPSnP8Z/mHyPQyKPoT/R sIdFaH8uHuz/PVD7HNhrdQRD/bsBZl8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 spamscore=0 bulkscore=0 impostorscore=0 phishscore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630459434158500 From: Peter Maydell In qemu_receive_packet() we check to see if we should pad a short packet. This is doing the wrong test: because this function is used when the device adds a packet to its own incoming queue (i.e. for loopback), we should be checking the NetClientState's own do_not_pad flag, not that for its peer. We didn't notice this earlier, because at the moment all the real peers of a network device (i.e. the network backends) do not set do_not_pad, so net_peer_needs_padding() always returns true except in the corner case where the network device has no peer at all. The effect of this is that if a network device has no peer (e.g. because QEMU was started with -net none or with -nodefaults) then we can still let through the kind of "guest misprograms the network device to loopback-transmit a short packet and then we mishandle it in the receive path" bug like #3043 which commit a01344d9d78 was trying to fix. Since the distinction between "we should check nc->do_not_pad" and "we should check nc->peer->do_not_pad" is a bit subtle, add enough documentation commentary to make it more obvious. Cc: qemu-stable@nongnu.org Fixes: a01344d9d78 ("net: pad packets to minimum length in qemu_receive_pac= ket()") Suggested-by: Bin Meng Signed-off-by: Peter Maydell Reviewed-by: Bin Meng Message-ID: <20260629164246.2028947-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/net/net.h | 23 +++++++++++++++++++++++ net/net.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/net/net.h b/include/net/net.h index 45bc86fc86b..9edfacf827c 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -349,9 +349,32 @@ uint32_t net_crc32_le(const uint8_t *p, int len); .offset =3D vmstate_offset_macaddr(_state, _field), \ } =20 +/** + * net_peer_needs_padding: Should we pad as we send out packets? + * @nc: NetClientState + * + * Return true if the peer of this NetClientState (i.e. the + * destination that qemu_send_packet() etc send to) requires us to pad + * out packets that are shorter than the minimum ethernet frame + * length. + */ static inline bool net_peer_needs_padding(NetClientState *nc) { return nc->peer && !nc->peer->do_not_pad; } =20 +/** + * net_client_needs_padding: Should we pad as we queue packets to ourselve= s? + * @nc: NetClientState + * + * Return true if this NetClientState requires us to pad out packets + * that are shorter than the minimum ethernet frame length. This is + * the check to make in qemu_receive_packet() when we are queuing a + * packet back into ourselves (i.e. loopback). + */ +static inline bool net_client_needs_padding(NetClientState *nc) +{ + return !nc->do_not_pad; +} + #endif diff --git a/net/net.c b/net/net.c index 5c39f8e7b44..0a30579ca4a 100644 --- a/net/net.c +++ b/net/net.c @@ -783,7 +783,7 @@ ssize_t qemu_receive_packet(NetClientState *nc, const u= int8_t *buf, int size) return 0; } =20 - if (net_peer_needs_padding(nc)) { + if (net_client_needs_padding(nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf =3D min_pkt; size =3D min_pktsz; --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630484; cv=none; d=zohomail.com; s=zohoarc; b=RHOxKeeL947CSaIxxYctVeNVTDGXGVVJnaLMzdUcN/7jB861TvZ6vjscR2KGqYpn2VgVdCJ3K41CiSMpQndfGYqQGXTMaLws+gzQtMlc9Ho/28NNSCWOqG6rFDVNCetfPiMEbKflADNpT/IZynkb9v6Z4e02KfiMK4Ii7LKKaD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630484; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=CdgvIC3nQLcvLayxllfnEnjsQotCjZRtIT0d/i1oUJo=; b=EQared80TcQ8HR/DARFMS4EMnWtSFHbBLqIQ8xUpelXqLtaQFMetZdXw7/XnU9x2NBUSdGUUBiXFoTX8xgaAHhzAPujdWmbsbrhljKGu5gVViIBcW1DSKHmiwSd5bdWRnMR0dT9LlWUwDJaSKT0GvxGyc+YXmrBCBblu2qULbfI= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630484429821.6503391843935; Tue, 21 Jul 2026 03:41:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7th-00062o-Kz; Tue, 21 Jul 2026 06:40:25 -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 1wm7tg-00062N-E3 for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:24 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7te-00035J-Ud for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:24 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LAR5lL1349401 for ; Tue, 21 Jul 2026 10:40:22 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj6pa84vg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:21 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51a8c689b5fso219526431cf.0 for ; Tue, 21 Jul 2026 03:40:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63ec7ea1sm39213499f8f.24.2026.07.21.03.40.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= CdgvIC3nQLcvLayxllfnEnjsQotCjZRtIT0d/i1oUJo=; b=MIzVXL5R1Q2YW2gn 63s7AyiVZULuYaT9mp2V7ADc526vjQMm0xPJLxHJphVmXqeuwHDKaspkKvDJv6I4 M43xWS53hNzqShtIK4eUansbqe3jEi31GE6YAixj1siMaNM+LPBlLA6DA9PwgvH2 rv8DTJInhB6u6pVfdAxLHI/7BqfPfF1IXblt+1beKJFKab69bsvEAR8uYTv/hgvY u1tIWkvXTqv1loGAY152/qyB9BCthLQoJLvXXooVyx0PHdLX5TNeaj62qicyufng 0oLOGXHHqkFopfaIblAJP4vT7JUqrmxEPPcPFb8UPDxYj22IWI2tnjSqj1rt3ahB ECZIZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630421; x=1785235221; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=CdgvIC3nQLcvLayxllfnEnjsQotCjZRtIT0d/i1oUJo=; b=MSk0AQjJqk0w3rOhZy51xiUPCjNRwQ9kLchAaiBT3Fh0qRlqxqH/NCyVWojJ8vWQk5 6V2XaIZ5pM6Fjc8ipcZ95gMgjYK8hNhsp+SfHDsaQrc65n7Oc/o1veYDpCxv3HRX1HP5 yykjkQ/po2lbp9KDLQZlaloUqb8qfMe4QwZ/rN2reLjjdffD0usUmq3TJ6abU7eXKwVa OoxqA1b+HsubS1Xm8fdIQkU6Y9+pBgV+aEoadIhvjw0Las+ncRiqtNucsl2itamN8p2b WvoCJ29o6+/lOHo2k51MZvPbGyWmmsY4CURi/9Bw0vLNCB/N9aXmnvPmorShyU+JgLiU gR5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630421; x=1785235221; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CdgvIC3nQLcvLayxllfnEnjsQotCjZRtIT0d/i1oUJo=; b=fB4LgrtEwUXdtCUboBJmGpHAndNn0ksh11gdyDG6oAlgkFSGGfusmE325BQ68n1j5E Grv2ZvfLNlaY1WGgnnmtVHlehvubZjNeGsbkSv8W8enlIytFriz6cpRmQ0ip38bV3y+S KLhB033zKtkEa7Ka/OqZoF4iitdGmH2QFaETpf4QBel6J+FkMP7rrs+ADFjIfiEQ24Ar 9HvCa/mjkVaPvNJhS+R0LZNIxaOn8eBtG8Q5Mip98EesfYjr68MLFThgdfs3grhsn9kO O8AGZrBEOg4LO7EKhOZplKwJL+Nn14VYXUMP+6C+Y2r7w+f9OHVp3DO/Xpnynz5DyHxA i42A== X-Gm-Message-State: AOJu0YwK5z2rRETjZ6+xiNXZKlYzUOgHA0i6hLcX2gNIhmv+MHg1Yxbi SCuRbGWAjS/Hi2ij/2yhKZLurD0RwLdhQiS4fM1c+hhyMhQl6VxMH3dUQRLFOr8d+cVogn09LAX bMRwvpQLxMpY3Dl6xsq0jJIKvEJoTE2kCIlHwOCW4B7stHcIWz22ednGlr9Gkfhp5GQ== X-Gm-Gg: AfdE7cl3HiT/FK4NPsdDzt5JDfj3XjHOqnpEDILDGH3rmgeQ/SUfXmJpsU6PfC23Y7H fQ47cmWX0+EVBA4zMz8BvrLKe8nAOp6GFe0pcntLHoGR6UkDdhpFiV6qTEwGS75CGSr1pzxK+8J a3nf9CV5X1/pDNe6trl0MsO2ZE2EyLza+x5NWDnS1DMy3J98vcGakFVXgd08kaCBDFzWMpay0lR sSOCRDuFuGyzWtOU3QKDV+heXbBcYwMaHZGXmMEojsmFtZrchmoHTDHMqGHWICfryUw9Cca0LvA B58V6Mdh0uJtHBZgC9i5hN0rCQ7HXOiCJZNHk7g3QSK5gRsIGTRosGrPqqYhCTaNfBTIZ9Lhg6d gfsqYDtVd19XVi+vrLUbfJP9rUbMpvvuRKxGNxbbXqCLZxOxsKi0T6H9gsw== X-Received: by 2002:ac8:5706:0:b0:51c:1a4c:3c9f with SMTP id d75a77b69052e-5213c007406mr163307391cf.4.1784630421226; Tue, 21 Jul 2026 03:40:21 -0700 (PDT) X-Received: by 2002:ac8:5706:0:b0:51c:1a4c:3c9f with SMTP id d75a77b69052e-5213c007406mr163307151cf.4.1784630420744; Tue, 21 Jul 2026 03:40:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 2/9] hw/display/qxl: validate monitors_config heads[] in phys2virt Date: Tue, 21 Jul 2026 12:39:57 +0200 Message-ID: <20260721104004.84934-3-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: KMyYFEJqxIkDQIbLeTgsYJHMFWu-Fybh X-Proofpoint-ORIG-GUID: KMyYFEJqxIkDQIbLeTgsYJHMFWu-Fybh X-Authority-Analysis: v=2.4 cv=eYYNubEH c=1 sm=1 tr=0 ts=6a5f4c95 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=p0WdMEafAAAA:8 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=UO_m0OBs-Tm0aSID5pMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX1VBEGccV3pSE ajbGgZJqw9ng9g4g5f+Tg+XQ/rz/oyEaAI6ig1+r2YLo7PK6zJ4OQPNn/qolAJMPXOjNc4psbGG SwWPoh8s0O8nSPXVWzJ97IXjhHoWStm9DsRZRdmoT0p44+OR+C18MnueH00/0VmhiAzIAHveAPg hd6eRLjSjROtl+/y/cXJtJMzH90ejVg0un8nrtHNZtarHin3EOwfB5hBojst5fEZMwc/ocjGTOk HDOk05Wko2HyEfmUzXjYuugu/ccoh6Ep1k8hqPI4v6zO9DbpiUnPhJ0ntB1qsSJEsOm4S9YmSX3 Aq3gn9lkDeVKL8eTr8/YnleJo9pWh1ZINd7LM8M/wYpXal3JoI/BSJ3XDsWVUzZyqhZIhO5MBRO lsFWfF499UHRXDwotnf2vApYjkohxS4PF473FFe2KWBjezabHBfiBcyQvQLCo6aMhA9WbMrx17A a+gpOmQg7oTlfZ70pHQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX/S8w+NO2uJji kECZ8gUWLw/6u2J0d/kwV6XsKmpzrhGup0AchkH8SVJvgqQ7DaN/UmOTKj0SD3IN5opVCCJxS25 57ZIxabXtmaJLr/cMtDBC0chdZi9r6Q= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 spamscore=0 bulkscore=0 impostorscore=0 phishscore=0 adultscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630485609158500 From: Marc-Andr=C3=A9 Lureau The qxl_phys2virt() call for guest_monitors_config only validates sizeof(QXLMonitorsConfig), which covers the fixed header (count and max_allowed) since commit 8efec0ef8bbc ("hw/display/qxl: Pass requested buffer size to qxl_phys2virt()"), but not the flexible array member heads[]. When count =3D=3D 1, heads[0] is accessed without its memory being validated, allowing a guest to cause an out-of-bounds read. Include sizeof(QXLHead) in the size passed to qxl_phys2virt() so that the first head entry is validated within the guest memory slot, preventing guest-visible memory reading. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4027 Reported-by: Tristan @TristanInSec Signed-off-by: Marc-Andre Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260715072722.1643289-1-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/qxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 74258afa582..3df796175c2 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -270,7 +270,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevic= e *qxl, int replay) } =20 cfg =3D qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_G= UEST, - sizeof(QXLMonitorsConfig)); + sizeof(QXLMonitorsConfig) + sizeof(QXLHead)); if (cfg !=3D NULL && cfg->count =3D=3D 1) { qxl->guest_primary.resized =3D 1; qxl->guest_head0_width =3D cfg->heads[0].width; --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630515; cv=none; d=zohomail.com; s=zohoarc; b=HO1UduDsQHmIZzJILXvOA3QzypA4BCmsJFnJHV7m8qm4muMsqsvN+RQATRDm5QZ6jsW8yt/wcQ/foU0J0GDTP7JUCuoP/WY11ewXBChVb5vf7B2mAie3XP2vDEjEfZoHm181OiTqbP9/MpKhYFUvcyCLs5kmD5s+VPZwgTiqUqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630515; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=DIzpMBVIX9iNrP/c8/KMOEKN80fjo92tfLWtNpAZBd8=; b=XzOwpkQXiwPUjPQmAkPuy84ZPCPYbtSFqK96wpAnjUwUn9K9ImpwyNe++PyMi7kZ/tDL7UX6LwPfPmjpDBN9MvPE4XCAsCDNP49xIXUmIi7BgvlIi+yfqPl8bAAIWioPAK0f605v51p4oWGKaUb3+y1mPl4v2qmLaxOQgykt21c= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630515114137.7229650913764; Tue, 21 Jul 2026 03:41:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7tp-000657-QT; Tue, 21 Jul 2026 06:40:33 -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 1wm7to-00064u-M7 for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:32 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7tl-00035y-Pg for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:32 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LARvNs1252118 for ; Tue, 21 Jul 2026 10:40:29 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fhqvcbyuq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:28 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5174a236220so205537221cf.3 for ; Tue, 21 Jul 2026 03:40:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49563969482sm158369905e9.3.2026.07.21.03.40.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= DIzpMBVIX9iNrP/c8/KMOEKN80fjo92tfLWtNpAZBd8=; b=eSC5/TMK80oRXZVz MxqT71J4lRUQukt5BDBZpqA0RZOPveho5T9PqbcmTJeJjHpT8xwQEbSLUPryZ67d iZWqkOq8aZwzwPm2S64KK5Ob6c+dNfhka/qXeuqnJ5KHxz8mkQRB0gIgxDrAtg/g nJ7unpbENhBiatfg2XJ//84CX7x5rK9mm0aZJoUXwXtyyyagUjG+EAVqqWYJuxo8 SNCV7LQLUFlH4sUlhFgTuMzF94UJ4z4mpw1IWMDRyC1cPOO8hz974ap7fMJX57hN 1VeSdWsxtmzEeLjoDXHlmOreXv2J3XdrPUo+s1mI8oMCHZC7rXrh1Fx2VDLLMLz9 k4VZiA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630428; x=1785235228; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DIzpMBVIX9iNrP/c8/KMOEKN80fjo92tfLWtNpAZBd8=; b=Gt5vdY1c0zHvrP6j+lnqT+D5h2cnkLQX16MaZHLVdWL1aQvsVcpUkrw7CZ87hSajCk FQcS4Ri9w9U7O0jbnfWynMLnEK9f6nM5Od7hTsh8Vp9FKuXpm7dg/strL/WxjPZ7yrDG fQGAiL0TAtU+2wjuuozOwvcwv9VjrV2PrsMHaRpM/9PWqURTGlrZEq1NPTksIVfAr5ck 2thdPW8X4sw6APchV2VeWn0ay0kjobbRX5NUUaXZEPNo6VdFzZoBXzS/VXtZhhOMheWw IYANc7ZD+sKKGtJvpu+JDYL2yneIsnJX8GOBYqBiuC2ocxZ0LCQnpuA34wx8jxsuYc7/ mqjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630428; x=1785235228; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=DIzpMBVIX9iNrP/c8/KMOEKN80fjo92tfLWtNpAZBd8=; b=hF8yRJimqzZ1sP9q+4NbrHBfpueK6rCmZZUS5iySS2w2BGpWdab77WsvfaAe780h/X VF13aWeqSq1MKwp76+osYW86Uco5HiZYbA47687rKVLfMnr0KkADaDritBBHWfQpfr80 kQzJtO22e9WoEDZJByY4EHuracnzMuQJuVf0o5Quxz+VDSe23PLM3wrw4CQMR7xTqUSQ Eauwmi5xgrgd6MFJXEkPah265jAtDrwz0KV/reqFunqDfkE9lQLhsHAJ1INMpFWjS5Eb BLvW7fQuHDxbiiGNWPFhssNxZg2U0qLQvVsEVd0PVJIMRKyZVEMJFdxHfy2oed6nP+BS 8Ewg== X-Gm-Message-State: AOJu0YzEhKfy10wTdDIwfAtBeOJvl1mSgdpd3s5VY6D5mTW/7RE8Ky+r HGBzIO14397Ziv5+IM4FCGGG3qIF8T1mtYURSsAvumoqBEVE9xp0mr7WMyrYDwhc6NJTq+6ysDq abAl09yWs+lg4fY5lI+heu9N4VYesT4UYg3zjssaf1oXhxGzc8NxHpYZzHOQtQ/gE3w== X-Gm-Gg: AfdE7ck8fHFySiAmfEQQykdncybceS6NFOZPsY4r4xYtrKdXSER75ZBP3CwAuBglb9e QASq1/xXSYaAgw0efW7F4KrGPv8nB3kt2cNgA645xOOYLryxiQaflIlkN2IbUJSshmksrAIfqT3 g6pHdM0YDtJz16bppD0rNC5ScmwMZX2qz6g8Brp/S+nIG2w1OZ/JgPd/J0CBycB4f47AXSQVsAb m43RUKm8BOe8EcSzsBfV7HHKHp8SWAtCzld4O+MWRY3mLmJ+iSdN+XRPFyMlZouJjXbcXRp5lcE JnQeVLWRZoL/Fac7kQbf9/6SeLeRDpD3kEIdNpq1s4QieC3tXjtknOCEjC4jVhRMMu3hIr3pXzX tO7vfSElcSQ97Zkvq2Rto6zVwXqp8kEtDKmd3yrNKPNHFgQPTkxGoupen7A== X-Received: by 2002:a05:622a:1f0d:b0:51c:13d6:b4e3 with SMTP id d75a77b69052e-5213e67f164mr164452011cf.64.1784630428197; Tue, 21 Jul 2026 03:40:28 -0700 (PDT) X-Received: by 2002:a05:622a:1f0d:b0:51c:13d6:b4e3 with SMTP id d75a77b69052e-5213e67f164mr164451801cf.64.1784630427723; Tue, 21 Jul 2026 03:40:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/9] user/guest-host: Include exec/abi_ptr.h Date: Tue, 21 Jul 2026 12:39:58 +0200 Message-ID: <20260721104004.84934-4-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX0oc1J/zFd+dt 8hLQhsZb0Im5WvFBjHV95nD97PA1KKix0A1n2JjsnnquA0feTcb79Dwa6b3CNz4jNLRxrV8DM9a fYLhcwCR8DDise8wWCaeQPOYVuVwFVM= X-Proofpoint-GUID: WWF3wnVkLrnrgDaP68_5oI1Fb1SazEW9 X-Authority-Analysis: v=2.4 cv=OMYXGyaB c=1 sm=1 tr=0 ts=6a5f4c9c cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=xfvfwgUyMf2eb4QU6igA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: WWF3wnVkLrnrgDaP68_5oI1Fb1SazEW9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX9uSC27Txs+2p LacO7tUVlS57msF3ODq4oHrAAoFqZMc6dzmFi2KF8x4NXTftX5eTTWRr+NRWONefS5LGyrNEXbM xAqecBVAR+D5cuhTAb7Aeq88YfitNyj0UNGx56hnfKs7P4SK1bGdrV8HtsqgN/DLIj6+3cgFWn9 F5SXT5cYd1BN6ySX/HJG9kljVKVfW1RLEphG6pPy3mNG3p4VMt3yFf259QLdTgptbTDUqrlv9xd jSzrW7+jjWBmEgX/PHk+PmcBKybVzELYTojEyDPYCAkHtDF8lfUBLA8h2mEBXwbsStCHDbgUNdE Zhllq2hJ7F6Grl1dLGvPyuu5ctrLrFIGMaG9tBbMVSa9DesLdsGIS1jHQSPqsF3hEZc7gSEKwtl BSQO5/VkH6H67DizM1dRzcmmVeTIM35AXdAGxuLNty4pWlUY8TtLoBIcWm4XhlH7H0TfKydx8ke j1lo4mMCod61yXzl+eg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 clxscore=1015 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630515710158500 From: Richard Henderson The COMPILING_PER_TARGET block uses the abi_ptr type without including the proper header. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260717232306.378988-2-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/user/guest-host.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/user/guest-host.h b/include/user/guest-host.h index 506efc097e0..f136f81f5d9 100644 --- a/include/user/guest-host.h +++ b/include/user/guest-host.h @@ -80,6 +80,7 @@ static inline bool guest_range_valid_untagged_vaddr(vaddr= start, vaddr len) }) =20 #ifdef COMPILING_PER_TARGET +#include "exec/abi_ptr.h" =20 /* * These functions take the guest virtual address as an abi_ptr. This --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630484; cv=none; d=zohomail.com; s=zohoarc; b=hs4XiaYbsXZ2Pg43XftuHEwhShaU63G9D9bpOb/pYpz9QrYEkqAN+EINi7HEaRuZC3Ziz39xHGLPQ1inKa8g0SV+xxts/NheJKa2LzvW0zdnbHVjzmplJerSiKxcy9NSHPtrEJuZaiLFCmD1AL3NoYQZPVG/s6lZ9TpcOCjfqcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630484; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=0RPqPhzWejwl8D2kGhO3BkJ+420N4gsV0OefL4OgfOQ=; b=louZPG29ROhKKJutAGOIRiWFYR5s2MZQzWhxl7vz211L66ZdDOCuI9ZK4ntoGN22RZWevHYBLfGXfrdXjlFjQTuasqfVK27HU6jQqMNoB4mm3LEmbLnt9TUQGWESmLWza1bxO/2yZ5OgYUjjGUyvz2m/4eEwQ80YjshZpty+YxA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630484352208.84265170858532; Tue, 21 Jul 2026 03:41:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7tw-00068H-KL; Tue, 21 Jul 2026 06:40: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 1wm7tu-00066c-UP for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:38 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7tt-00036C-Da for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:38 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LARUpv1455627 for ; Tue, 21 Jul 2026 10:40:36 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj1duhs3w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:36 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c0408254aso109459941cf.0 for ; Tue, 21 Jul 2026 03:40:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954c0a81f7sm248957665e9.1.2026.07.21.03.40.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 0RPqPhzWejwl8D2kGhO3BkJ+420N4gsV0OefL4OgfOQ=; b=FA6Tuy12e1EnuUGW J9ntfPWPlEY/woVAzT5XczVl3+H2SEJ9SYxhmEKzAVfFjTUUJvCDt+Fua7930Q35 vl+7cN0vBwBRETTnkL62gv1VWJ0vFV8J6zSX5JqS+3dl2uNksQutaTF6eiPUKxgo Hy609mllxWqpjysRF6jkC8jXScMRRQ/A60JsGv7mA2uKCztQbI7cO7Z/eB67FGZM 2gl5QnjC7JuxJQulG2cwToFFyJxiyuv/m2RKJpj19YMsELMUGk7jCzJ6LWE+xSTK MNry1SRrYdsg/5nWTqMM4IZOk3SmHI9lcHRusPI7On6QKmzDbi9t7aSFpAHAhXs3 JxDzJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630436; x=1785235236; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=0RPqPhzWejwl8D2kGhO3BkJ+420N4gsV0OefL4OgfOQ=; b=SIDe5k/iqhsuR9cpVs3AOT1+LolhfECd+wkfIuYg+tA6QTzqtS6suK37JQd0fDUHEA tl1xJfzjNUcsvpzcRvQq1cQyNs8wfsUkGMhn8UMs675N7JVi0/8agES3TrnKVLCs3Xc1 9f1YGsIysvmxEpUnqj+Ov2gTn8rHttUcACkG/LokM/zMmMCD7fBMwE17v+9rjUwlwJlF ukH5LDVU4zbHlRGQzKpMVlGqs2FL2bTrU40wiVihO0JJkjOVx5J0RKLLfu3jPG1IsVO/ eoS7XZV0+ZnqGGpwMw27kx708ergd9lSODhPcsPICulQ9L1qo4TuH4sEt9T/dM/7Ss5/ z0jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630436; x=1785235236; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=0RPqPhzWejwl8D2kGhO3BkJ+420N4gsV0OefL4OgfOQ=; b=gp7fgKhV8NbQRFOAznuAtYY3SMqPSzYd82dmvJivmaz3O+orjuDCgUrOIPEAN4OlkI aslQb+5C2k9ezh7oJtnoEsbolLdtYBXGiPcDbiibhUU5eec1aevEndco564mC9Lxoxa/ o+3uFLN4ggYZYpMvFezw/y/o0IHZOtD4jqWCpRbgbnNlsxg8zom6B+Eg6LY0jNrC5a7F Ya+8kVhMgY0wY7IS76hEiJfRhxAMiJ3R4DnRIqL4ziPPBQTNiqPyx7fuKvCklOG9biwB v/n4i7KoQzrvP1U/2A0PD5IBqIXIj5PFKDxxsqTN9OvxjIrp67g4LB5x5L9DO/SK9mvk hr8g== X-Gm-Message-State: AOJu0YxEvrtOMx9S/hujl9Ku2thbT61cMVMobOG0c7TF5O08d00Ejyfd nTUSlds1kYwNAtevrHpEe51s23nd8iHMq2oOIt8bR7cZurrppvpbH7VPb+txIPma5MdesPjUhRc kB8LCks/nEEE0zeRngBNskteOXhHMVnM+FJu6suQCevxA6sQTqBzcOKb9dL/Cg9ahIg== X-Gm-Gg: AfdE7cnLoY8ZWM6pQp21ydPqJLMZz7QSLT3BNBbqMTQFMc0n/Fz7oNWFmFg6BLeZeZh wuU4DJS9VcjHP9BRSgwmbmJdxppY1xN+rCtkx+czJS/fG4URIviU0ADL9qknwYruawohLC7Vdim Mhait2gd5tS3cUxCu2Wjj43920obpnJBS45c9uLazWS1P0GyttdPl6goGaORS3Pzl1H/fX8t/gk VfcjyYSNmjl50IsnkutgF2aWYcRRUgifAOr2Uw1P6varUJ3Vae2rLzq4G0kcLYZakP0quyZI7PO /okiMsBfmqB6gAo6uWtLqmSW1M25R3yRNmMQ9Mz/zD1zHDe8SmmyFhwPfzEeyU1x3CIUcDRCYqe U/4cfjrW1xt+DeGl/WRcLnhMWR45Vi+jbjUlAsjBTy3bGJJTcrLqxfggztg== X-Received: by 2002:a05:622a:3:b0:51c:11c2:dc17 with SMTP id d75a77b69052e-51fc214babamr194045561cf.40.1784630435769; Tue, 21 Jul 2026 03:40:35 -0700 (PDT) X-Received: by 2002:a05:622a:3:b0:51c:11c2:dc17 with SMTP id d75a77b69052e-51fc214babamr194045421cf.40.1784630435268; Tue, 21 Jul 2026 03:40:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 4/9] replay: fix use of uninitialized pointer on error Date: Tue, 21 Jul 2026 12:39:59 +0200 Message-ID: <20260721104004.84934-5-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 4-6I1J-ItjTm0vmCF_0CRRBzfE33t9pP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX7ICXWXW7P7w/ QSQk7FRfh9D8Jwhac12fe8NXpLPZqbRrGHC425OjUYucqANtGoe+I3/LlQwaY4l6apYuTmiQyUS s54wc4CxLSGm2/eoZwDKlAQ4EFOEdClmrswTaO2B95ZBvb9lN99dFR7coSxAAlIXu+znBSL5nLK RzDt6Ym2QObBmdV+MXX4cRJRum8XCU141ohjXUqof5+1DXj8XowkMYB6FuBi9rlXiCItgn2w1Wa kNB9142uAqTq3mRRtZ9XEFkfIW0kH9x4XPKjoSjYxVFGXRl/LVYATTTXuZneGrFhg92pAu48PfG qmkEuqeFf8lIiI8ArA+1AqW456ICzoIUnqxfyEABUD93XEu6aiQl6cHO8C380pNvXI2rXw5i4VC gByYifBBmtS+vSSiLmfT01eXuX0xKdmtl+xEJRUaf1ebrOWXIZ06LKy5krqnsMkqr66U/zJkL0H kZJXjxPZoUEvf/QxU0Q== X-Authority-Analysis: v=2.4 cv=I9JVgtgg c=1 sm=1 tr=0 ts=6a5f4ca4 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=RXSMPkjri_SMByUj9oYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: 4-6I1J-ItjTm0vmCF_0CRRBzfE33t9pP X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX7b7VoQ6HVm4Z t41sjRnyQHYCDD0RA8Rky+E+HCvpS/q8Soo4eIwydyaH7jlGfs4OzwM9aDQUYgdNVrIMrzZ4NJs 2t7OdSwCQkm2OEr094et1Dc8sbm1XgU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 spamscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630485620158500 From: Marc-Andr=C3=A9 Lureau When bdrv_snapshot_list() returns a negative error code, sn_tab is uninitialized. The loop does not execute (since i=3D0 < negative is false), but the code falls through to g_free(sn_tab) which frees an uninitialized pointer. Fixes: f6baed3d1485 ("replay: implement replay-seek command") Signed-off-by: Marc-Andre Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260719113216.1177594-1-marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- replay/replay-debugging.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c index 11053640021..7b904a14165 100644 --- a/replay/replay-debugging.c +++ b/replay/replay-debugging.c @@ -139,9 +139,8 @@ static char *replay_find_nearest_snapshot(int64_t icoun= t, int64_t *snapshot_icount) { BlockDriverState *bs; - QEMUSnapshotInfo *sn_tab; + g_autofree QEMUSnapshotInfo *sn_tab =3D NULL; QEMUSnapshotInfo *nearest =3D NULL; - char *ret =3D NULL; int rv; int nb_sns, i; =20 @@ -149,15 +148,19 @@ static char *replay_find_nearest_snapshot(int64_t ico= unt, =20 bs =3D bdrv_all_find_vmstate_bs(NULL, false, NULL, NULL); if (!bs) { - goto fail; + return NULL; } =20 nb_sns =3D bdrv_snapshot_list(bs, &sn_tab); + if (nb_sns < 0) { + return NULL; + } =20 for (i =3D 0; i < nb_sns; i++) { rv =3D bdrv_all_has_snapshot(sn_tab[i].name, false, NULL, NULL); - if (rv < 0) - goto fail; + if (rv < 0) { + return NULL; + } if (rv =3D=3D 1) { if (sn_tab[i].icount !=3D -1ULL && sn_tab[i].icount <=3D icount @@ -166,14 +169,12 @@ static char *replay_find_nearest_snapshot(int64_t ico= unt, } } } - if (nearest) { - ret =3D g_strdup(nearest->name); - *snapshot_icount =3D nearest->icount; + if (!nearest) { + return NULL; } - g_free(sn_tab); =20 -fail: - return ret; + *snapshot_icount =3D nearest->icount; + return g_strdup(nearest->name); } =20 static void replay_seek(int64_t icount, QEMUTimerCB callback, Error **errp) --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630482; cv=none; d=zohomail.com; s=zohoarc; b=eoE6evkPjramx5Btm9vsJaHwGUShFmSAASXO6vEDkVzlP/FTjK2wrvwkjt5gW5zBiuAFv8JObFHcz38BvOTbNzbmllELmsdI6TVZf9LfNZa93G8Hu3/VynOsuwFl89lnR1Te0Knh7/Jopafc7cmIaQxxRwWboQlGc9nxh366wIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630482; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nKCCKA0zIRI8NXWmmd7NgkQLUbPoU/2z9XYlcCoNbTY=; b=YVR5vr5afATYPDWPiwiE3pltiVYnDEpXlszrsvJPeKebf41K9GYpm99f0uaDfBhbEvFIL8wi4CD3f1dZ6T0RF9c14oxGb+4jFayHCD2pUhew1/FVmXg2bBYXIqaCDFZOcHgXINgPAmG7omEeOIr3nKPkiW8IURLRQziEOub1olo= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178463048244048.934098544193034; Tue, 21 Jul 2026 03:41:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7u8-0006NL-Tj; Tue, 21 Jul 2026 06:40:53 -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 1wm7u5-0006Gd-A5 for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:49 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7u1-00036Q-B9 for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:48 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LARJcq1385792 for ; Tue, 21 Jul 2026 10:40:43 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj1se1n2m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:43 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51bfe3fa93bso228780561cf.2 for ; Tue, 21 Jul 2026 03:40:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-495653c98ebsm53232485e9.13.2026.07.21.03.40.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= nKCCKA0zIRI8NXWmmd7NgkQLUbPoU/2z9XYlcCoNbTY=; b=jLeHQ1rehMUeRn7K 1alHth9tWsPDToZBnVsTFwzIjrPQI8SpeczCgVIAtmqVcfJr9UqKQOZl+doWMV/6 Ct6+9fI6i0i39ku3oLYWNaSdyvh9kT3TaP31+YvgOLxHaS1AnToB9nh2w7WwHVwf kUW0TaSPEn4lhgIqY7RM5UjSFoywfBtVGbPpvxnFrFi6uTKVT4Y2dKL44ay9m5V4 7LDQuAyi0ByXeXWYfVzy70Gwqb3D2cdmhZtL+tBXOE+S3UpMRd15V0f16Y6HnD+I kUz5z6zjV/lcH2IgURI9MVelB3n6Q7N/mNFgpLRh7V3kujUE/SI8bI+AgRv06d5C WtG2zg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630443; x=1785235243; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nKCCKA0zIRI8NXWmmd7NgkQLUbPoU/2z9XYlcCoNbTY=; b=dvaGmznmilLMYSu8XbXCFvHAamiEZcy7oytvd6QzbzZ2wIEw7aveCsNmOiF8Vb15tz Q55U70qc/RylmTFyP6mR31iUBg4Fna8D7XFDEEcNE+fqD6YBJfa/FG7Rt2ucpybwD/dI pWnflRG3qPMX+C7v+wgjZgtfnHkxXJLf/azB8taTSl2b6oXntiJMs9Q7KjvatKzSMJwz eOpzMA2CxGTNZ3ij41y9qJaJzN1TdBata7ybCUlB+2lgVuthKRFOIjySwqLSqbMDv//G RAMql/Exhiel+e+WrKz/RYLbC9XCs0FWozthF0yHqaiEApkq/1OnDcKozysH6LgTiVgh aqsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630443; x=1785235243; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=nKCCKA0zIRI8NXWmmd7NgkQLUbPoU/2z9XYlcCoNbTY=; b=LNopMsarnPmxGhzIDzIIRzCf1Y2cATmf6dPaC1ts7C9WIs3RrFaaP5l2XccbxkpM4t nxnAXNSGYj5hsQFVS6j/ixcMq4UEfE0CXZ3zUFOfwroWQ/IGFnPCh8yWmQUKscDIGJpv nfGrCRIrEr371F94YGkePDF/1ojS4YYr+z1xv2fr9OQhvVCXpPGpAXnc6bpmvcIwXmYS Dw3DysqBiC09ZUYw4UfhP4nc5u1X1RBK4DS3IziV2ncKvTVjnOIfaqUSBtVWII3cx3W/ yiGSDJfztENTx4Rr4xv7Bbukk2rspcSgtPWn4ND2hmkmNx6Z7uCPPEMxdJFgBXKNmXnv 2wNg== X-Gm-Message-State: AOJu0YzLuE2ZuIAZT2lsFszJ2sBgq+SI4pFeHFQs1Gj8nfboULlyg4kS rAa94WcIx+JlDvZ1fX5bu+7BDy8GdbZwbUpV3LQHziY867t1mO/rBa5J8uHvdwRtjxogLFD9zq5 JBAm14oFWoJwhShoaPLfWgAnqh2bPFHWm7dE/k8r9b24DasAkt6YxuKo/Ridg+XjoMw== X-Gm-Gg: AfdE7clHkZXH5Fb2Mg/T80+ykF7pdIfxV6EMt8RKDKoTz14qtq5a65ZsChuL20R8R0O t9nJIgIdCFYY4myLhmrpKYedJZyiwFtZ21YiyQzvMTZ4fu5lEUpLvpfV7TeiWoASIxj/Bu5AWIb OFVypKuCwmbDUsuhyldFNDHRFCXPLx+CGZkkPXBHR0guHzJJ0ibyE5FbZ/tWsDCQWE44naFEix5 Om16uoRbaSc/oTLzWNcY9+RDBwynOOaBQIWyfmmCNlwt6cvbIErXbaPgiti05aPVg2wSqGQACRo RYU6rj4QG/JekJBA5NeKRAVXv0VveUPtj5wt842o2ECN4YRv0JGqTHtplXit/DqUOJRki0+1Qpt qg9Ut5XulOUKAF55flnW1b3myK4DhqgT/UnfZAWHMu6QJn1tDZg8SmabWig== X-Received: by 2002:ac8:58d5:0:b0:516:e974:6f72 with SMTP id d75a77b69052e-5213e082509mr172566241cf.50.1784630442806; Tue, 21 Jul 2026 03:40:42 -0700 (PDT) X-Received: by 2002:ac8:58d5:0:b0:516:e974:6f72 with SMTP id d75a77b69052e-5213e082509mr172565941cf.50.1784630442261; Tue, 21 Jul 2026 03:40:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 5/9] hw/misc/applesmc: Fix a typo setting MSSD key Date: Tue, 21 Jul 2026 12:40:00 +0200 Message-ID: <20260721104004.84934-6-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: IJdwoj2sh6eKHmntRlgRj8SOAW0zT5l4 X-Authority-Analysis: v=2.4 cv=TIZ1jVla c=1 sm=1 tr=0 ts=6a5f4cab cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=Kxu_bcSrytRNNWQTdi8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX9eZ4EYGFn/Gu KMlinC2sl829hQg6dbUfkxeJdUHAznBADhzTCgsecxETiRcBoxZOG2n4KE11Ag4xmZ6ryABGDJu 4uAor2M1DHWLqpL/TMRtyfgsOilD2PE= X-Proofpoint-GUID: IJdwoj2sh6eKHmntRlgRj8SOAW0zT5l4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX3oYRF4eMW5YE mseiY4UkNH19qRiyf/ZeJYHPjVlPt1XX4nQv5FzlfGbK8L0RrjaKqOl0+IrbASFPsjEfG3OC8/u Xc1hCUtpj7y75b7RnUiWDMBMVCk4mIJeqKfJG1fEgosSKYz7Z8JzEVbOghdCoWi/SPA7Bwn59FC 8to0nWhT1WQznbd/m5KDAOHqGzkNNc2kwhmGE9nIQtdnsXsvTi6K8CpKFegJ4/CJFaDuzTJH0b4 1xqIswhDjBkEBfiv0GO6Nrmm8AV0AQ/KyptrvK9FCB5TrJ0De8Vnj55B6tGpxfiMY3xzYgrvikl nisFZN3zAa9dm5g1fvtPchyvnTAPVwB4TC2Y3yGaNykDRuwuBWeyzpSHyYWydzvOQ7D0ikQCDIu xpd8Zx7o9CUDKyGozeyAt8DlEF/NJ7OEDmgcVJxEkRWr3DpTj9abMZ3oxVLLIlmiRdcFtqP7gKv dpwg2plXnYaD6lWnnbQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630483622158500 In commit 1ddda5cd364 we meant to set MSSD=3D3, but due to a typo we ended setting MSSD=3D0. Convert the two other NATJ and MSSP keys to use hexadecimal notation to avoid similar copy/paste typos. Cc: qemu-stable@nongnu.org Fixes: 1ddda5cd364 ("AppleSMC device emulation") Reported-by: Matthew Jackson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alexander Graf Reviewed-by: Pierrick Bouvier Message-Id: <20260720115336.75063-1-philmd@oss.qualcomm.com> --- hw/misc/applesmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index fd96f5f245f..d004e8b4431 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -333,9 +333,9 @@ static void applesmc_isa_realize(DeviceState *dev, Erro= r **errp) applesmc_add_key(s, "REV ", 6, "\x01\x13\x0f\x00\x00\x03"); applesmc_add_key(s, "OSK0", 32, s->osk); applesmc_add_key(s, "OSK1", 32, s->osk + 32); - applesmc_add_key(s, "NATJ", 1, "\0"); - applesmc_add_key(s, "MSSP", 1, "\0"); - applesmc_add_key(s, "MSSD", 1, "\0x3"); + applesmc_add_key(s, "NATJ", 1, "\x00"); + applesmc_add_key(s, "MSSP", 1, "\x00"); + applesmc_add_key(s, "MSSD", 1, "\x03"); } =20 static void applesmc_unrealize(DeviceState *dev) --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630492; cv=none; d=zohomail.com; s=zohoarc; b=NCjzHFNC+cgYAl+02rHd2ao2Rlp4FKa3EU8NYT7USetI5RXqTX2YDLS46L3AAEMStMHDFQGfbXxo2C8o5USkhAS5M4xKRV+o5y5unPLrwMsAf4CHfqiX7HMg0f0CKXo+ozkZiME/Y0xI4z8Yr+0lTy92Ezdvcz668sOMV93+MAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630492; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=v98OUyNHVoEImDtK/FwT7ApOp72nP1SHAYeex0kNqo0=; b=Y1wK3j6a0OJQ3fzlJ+K2P7b46FrinObgvTLIWZLsp40eeDyS+7pzxnD8xf41TrcqnVc+ImVLJvnWGoApVAjtteiBNzVyQxUtrZt5GIh1I4+HHZoXAJDiZgSbwmAniR6L8CnY8Wi7ewCqAenCYPBsHAsCAOoC9B80veK/tDBJFtY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630492305894.9952577886312; Tue, 21 Jul 2026 03:41:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7uH-0006aO-NP; Tue, 21 Jul 2026 06:41:01 -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 1wm7uB-0006Rv-2D for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:56 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7u8-0003AN-Pm for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:40:54 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LAQrrh2502597 for ; Tue, 21 Jul 2026 10:40:51 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj6nsr4pj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:50 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51c20762d21so107299311cf.0 for ; Tue, 21 Jul 2026 03:40:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63ed2314sm1969401f8f.23.2026.07.21.03.40.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= v98OUyNHVoEImDtK/FwT7ApOp72nP1SHAYeex0kNqo0=; b=R3IFkv2U8PkdcNE5 TRibpv89VvnFep7juvAd78t4Y49Vlp2HOgMWude8uz5c0a9kiOarUaPbTavs/mJ4 OlX25Sz5d071KC4sq2qbcdjYyWTA7xdN17/gaoC6OA971KNdOWasbzJEge/zrQDG p8DShsvlRFIoAcBBAg27nl1ZjC7HcngWiibZb+x5CFKRMzlobaFmOBrCWfb1o9kM fJ5hVor6rpTHUN19Ncj1h5mAJCJEZV7IX6tIh+KhuxXVQlipT3Nd046qjlt5hnNR 9UYGniOmt2mPWdaYENu/Di2E51hcNLLcdp4HFRSvB2TkQFhrT0BGw5Yc1uC7t6W1 MsNo7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630450; x=1785235250; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=v98OUyNHVoEImDtK/FwT7ApOp72nP1SHAYeex0kNqo0=; b=juPT/CXAj2XlADifhAkQlKDGodyEALHIz74L1hOJMAtcU0rtnFlrlAw+PRE8Xbraed iuEeT3fwiyoOgDKL8OfWnXTn1HwwGmGCh1yLpRyFKLzS2XbXl/Mn49AS0adefhnBYd8M oMqaNTFBbzSsYXJbHZca/HCVo6qjKwH8vgoeDLHFyoGmTPhaFUaXXRB3epkoxgvoPkXi AXPAEizCNjVmdE7eRGtwj+WFdLK0UvmrO9E8sG3xaS5C40cUVDUgHQWRO3dy2zQPIaD7 rTdGGWZWVAKD80sNAGvnu1aemIRf1XmNAdQK8p3dYNLENxfsXDpp8BvAifkgkdRthwAV CpFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630450; x=1785235250; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=v98OUyNHVoEImDtK/FwT7ApOp72nP1SHAYeex0kNqo0=; b=qzEbEXNVn5wBxY4XsvzbRQfkKyMz/lqPZIqUnKvnUFC5F/WUQX+CC9I2GIPRPfHfjo b6QpnDhMCbT+3ttsOmR9c6O2HUBXtjZUjEaHm0iZR6eYN62/W+wCbT6K/LxkE4jRCUBS R7nyy/ArkibtYEiFWGSTH0RXfY/eMH8v3PAEW/TgXBFrq3lHJBROJzTelEgkFSNFnz+z KBd4dw0OHfFOCFWs9qdmHTzc9h7kR2/7UmfvQo1mTBAfEkVnMav0P5Db1S1FRd2hB9Yo YpeNa5AiFfoSpjYqMDvaWzRQFsSMmwpv0U3bNu8Ytyt3U73XjCuaVRUULE/j7GLMAD0v 6kwQ== X-Gm-Message-State: AOJu0YymytSlaliF4jGrO5VvH1Y3eINMCTvVev7HYLtFnW975lRE8VV7 /oLX990he9r+hZQOs7E6puiF2CBATmZ/gy9+1rHVsS14bQrgajDvfoqhYC8yBY8VuAODvnmY667 Mzkr08srUwG2zF0GXGpHgdMBcuuqhexM5VXtm9IJJbX/Nzabnrf/MH9ailpqBf7lpyg== X-Gm-Gg: AfdE7clCUUNrsr87ZVnL40LA8+ZkRiZHXJm6PkCqM5xsJ4YRGliNpgrIiisN0lWmJCX gt7LFmd+AOlRZD/oE4U21VtuXTKYYvzu+t4VjOEhsqT0mZCfqdUckpmp0Xpz3+Eod7HcqeMdB0r NtRjOCCnv24taIJlCVhbvGMkGqgLTnE0Xd+a2d6rjQBaSJI9QRVTjUWEPwak3Gcpd7qVBp1m1E6 SMqZFWn1ekhLFL94RD4Hn2WyN2ZYPVCsQr1TJCD5Fcz64rlrHyTvk5ExgxR84BPgK7vpL22laOJ wRN9R0qAeXhn5G5kp5gPH44ex7v1njB/Or8zsasbBwhw75uXu/r0irkUtPDafsRrYxLWGJAXKZe oF9hH2zxuUICQrCZvyBXyZnA+zBsYEgmuuIMb62cD/6Pd8vmWbDJ1biY/uQ== X-Received: by 2002:a05:622a:350:b0:51c:555:7dea with SMTP id d75a77b69052e-5213cbd667cmr162883921cf.30.1784630449732; Tue, 21 Jul 2026 03:40:49 -0700 (PDT) X-Received: by 2002:a05:622a:350:b0:51c:555:7dea with SMTP id d75a77b69052e-5213cbd667cmr162883511cf.30.1784630449146; Tue, 21 Jul 2026 03:40:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 6/9] hw/net/cadence: Return current Cadence GEM queue pointers Date: Tue, 21 Jul 2026 12:40:01 +0200 Message-ID: <20260721104004.84934-7-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 9tphLoLUIIbE0YrWdNtGi9eTV78S8YI8 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX8SLi+HbLX7Fk yO7koYBM36DGnD8kmFxKTW9hx6ipqTv0nt33zqqkWSPDPM1V2ozTT40l8/DfpCOetmfZcJCJ5cL zsPOogJ/PCSQ+8dQY2WQJkBLzdG5jsE= X-Authority-Analysis: v=2.4 cv=ZJjnX37b c=1 sm=1 tr=0 ts=6a5f4cb2 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=FRSEYCzRAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=5y4S8oiitaOSQFV_i7UA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 a=H4N_Y-AU75W7NKDNhZlT:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-ORIG-GUID: 9tphLoLUIIbE0YrWdNtGi9eTV78S8YI8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX86PR34DT7bqa SBb3EwHbfORVPGAHjA3jPLl7yU7HcnfWGgXLpeM/5YAdPuOW9s0xzFHx4qjDM1o87BCs7lPxZZ4 FPI14xyY1Ixfly0F9WGTaRBBpRzsDkYzpUFNZsLzobykTdNdUjmkWZANpUbpVye8TUJDuxw1Uu4 S0vgEnMM0Zk0GzGl9tTm0Dgj3XWX3sf2L4+YNdxB9RrQMl+Tl6CHOsVdoR1MtwNAQCKgJU3xt52 ZX/0DEFziSLFKghzVqpGZqMQjwFCdQVzmgUlS4WUOnYanPs3X6L1mkGSfdf4+9JH2WttIsDXUrE Kp+nnjaWhOOAiExoyHpRhrbhyYf9wWcx0eZk30sAnokNpXTr9l8c0SJ1wGrz8QWZCJhv3aQWmgL oakyJR0Jh5nddIEnWOaZ6bs/mGw+y9WPsc42wgv9iFM+l0QpHYpSo9dF/RkdYub4urmTvBb1XZL XCRQoUiGv5GJBhN45IA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630493584158500 From: Bin Meng Cadence GEM queue pointer registers are programmed with the descriptor ring base, but reads return the descriptor currently being accessed. The model tracked the current positions separately while continuing to return the configured base. The Linux macb driver uses the transmit queue pointer when recovering from a used-buffer interrupt. A stale priority-queue pointer can make the driver restart DMA before that queue handles its completion interrupt, causing queue 0 to repeatedly raise TX_USED. The primary queue has had this mismatch since the initial model. Priority queue support later copied the same register-read behavior. A single-queue machine usually handles TX_COMPLETE before TX_USED and empties the software queue before the restart check, which kept the issue hidden there. Return the current RX and TX descriptor positions on queue-pointer reads and clear those positions on reset. Fixes: e9f186e514a7 ("cadence_gem: initial version of device model") Fixes: 6710172501be ("cadence_gem: Add queue support") Cc: qemu-stable@nongnu.org Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260720120731.2022475-1-bin.meng@processmission.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/cadence_gem.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index b568fa3392d..39e3620ef5b 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1469,6 +1469,8 @@ static void gem_reset(DeviceState *d) =20 /* Set post reset register values */ memset(&s->regs[0], 0, sizeof(s->regs)); + memset(&s->rx_desc_addr[0], 0, sizeof(s->rx_desc_addr)); + memset(&s->tx_desc_addr[0], 0, sizeof(s->tx_desc_addr)); s->regs[R_NWCFG] =3D 0x00080000; s->regs[R_NWSTATUS] =3D 0x00000006; s->regs[R_DMACFG] =3D 0x00020784; @@ -1593,9 +1595,22 @@ static uint64_t gem_read(void *opaque, hwaddr offset= , unsigned size) offset >>=3D 2; retval =3D s->regs[offset]; =20 - DB_PRINT("offset: 0x%04x read: 0x%08x\n", (unsigned)offset*4, retval); + DB_PRINT("offset: 0x%04x read: 0x%08x\n", (unsigned)offset * 4, + retval); =20 switch (offset) { + case R_RXQBASE: + retval =3D s->rx_desc_addr[0]; + break; + case R_TXQBASE: + retval =3D s->tx_desc_addr[0]; + break; + case R_TRANSMIT_Q1_PTR ... R_TRANSMIT_Q7_PTR: + retval =3D s->tx_desc_addr[offset - R_TRANSMIT_Q1_PTR + 1]; + break; + case R_RECEIVE_Q1_PTR ... R_RECEIVE_Q7_PTR: + retval =3D s->rx_desc_addr[offset - R_RECEIVE_Q1_PTR + 1]; + break; case R_ISR: DB_PRINT("lowering irqs on ISR read\n"); /* The interrupts get updated at the end of the function. */ --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630480; cv=none; d=zohomail.com; s=zohoarc; b=ISAXnufesC8cYt2agUnA3h81dovmDQtO1DTcMWw8SQuVwrq0hSybbEjOf6cS7CfJpA/kfukdKnpVy17z8ELmT85zpUBpABmZofndypV4RXgMtRLIcpxKevi7vmE55abPPFCdFmsEGfbU+a8sz/F8A7DjQfNKMAJdOA82p0F5tyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630480; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=TWY33JP8u+UOt+0zjsff3m8HKZN6QdP92OszQGz9q94=; b=AREE7bCbzHVMgEO20x6aLvrj+/OCE+t7Y5II082Unsg/FNobMIoE4sGIsz2ickM2BMWAiziVzSjv98KdtT3t+59YgyN41g1Jh/8u64ukVDQb6bCUDzQtRIUQHqxgOCUTBTdTTgfhiH0Zwgp9euwPdfGB86V5xPc7sCKIyFAZNbs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630480328745.08604183683; Tue, 21 Jul 2026 03:41:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7uJ-0006ka-RR; Tue, 21 Jul 2026 06:41:03 -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 1wm7uH-0006Yp-Br for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:01 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7uF-0003I5-PD for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:01 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LART6k1230186 for ; Tue, 21 Jul 2026 10:40:58 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj01aa4en-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:40:57 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51bfe3fa93bso228785281cf.2 for ; Tue, 21 Jul 2026 03:40:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49563eee22esm89834425e9.1.2026.07.21.03.40.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= TWY33JP8u+UOt+0zjsff3m8HKZN6QdP92OszQGz9q94=; b=YRgFnh4iYuHrEMoy PNVJtDvkleDwy59X337LFCKhHMSk4+8+i/KtLZv+jeo6zmaWVstXSs4Ziu6tHryj L6dySYB/rw+pD7/767Djna2CByCEpqV5BUzWao23g7LgG83GQpKrxDHb9pt/nY/B 103oy5oM2/szmS4+Fte20qK2gHCJUs5kswERILh1fJ9FAR0+9Bks53Gf6s+njArR XcVf8xcN+i2vNZgPf4f2Vzmk5xp1JAnurt+8kOUAPe/fxIgMnvowO7odMMFIINX6 LdQiuDbzX1i7WhsqKkxcIGcRvoRoOang7YzrjOULkngRpPL7mqJLJL5anwFCkfXh VDcqtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630457; x=1785235257; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TWY33JP8u+UOt+0zjsff3m8HKZN6QdP92OszQGz9q94=; b=fKMLGwkPQvMpyFglg8whw0SECg2STqaSlvuw3G9F9PX82LL86xLnZdPeND+UtAuDNg EQSYr2wog/s22JBUvCWdaRvJqjVXDimRymDspQS4aztJwiP9ilV5VXTOUYV5oN8mRjhU j0JSHNQpBu4f+FUHyaI9S939XlLRRnqtsFcPjW5CT1mKnOpmaZfxNTPlf7R4TdC4bZs7 0HfzxrQcnYDbDW9qQfl1MG7wamAdCzfI74rYUNtgTG8qO9sQftvnoPettvQl2km0deYc QrJMFOdRRn+PdG4Ym+FFcLKsuw6btZrD4OP1woHsC+Zm0iaVR4gJ0XO7H5KxtR/Nosc9 rUeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630457; x=1785235257; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TWY33JP8u+UOt+0zjsff3m8HKZN6QdP92OszQGz9q94=; b=kuMwzX2FlvQHpiqvyOl+d48Wd4yLtHCisEHSA3CRAD1byK2hlsctcn8yfgNL4SP0CV VMbbGkTRM3NXyp+GJDYNDeSYC+ASe2XhNZPvdj1v+EkzLV9PEYeqEjo/TsP8qQTN5y9O rLFfhSpbdGwqM+AOGC2l/1r2oEJlr8B36Zjgn8+FOc/Q5eS2Hy9Sq/gDYlE4y0oHSQv7 zChwhAGVzVasKRS4JEUf3mR2X8CnHS3J2qQLdU9flA2oOoVFE7m0QWFtrINdc0H3pgo4 uLTzYd4t0Fg/XGATiSTP75BhZw/rwn1DnrPzNpByAlsxzeSc1+gwYR1D1w0uyYYLjuA8 sKKA== X-Gm-Message-State: AOJu0Yz6yL+sPD1tLRkPrgwy2aNjEkn94Z7PyI+i/93aC2dUHgcL7ten McNRBmYlitbV/bFamXZdEEdaxL3JDXvYwQZt/sWswfzaOZVlE/9E/0SkFUDlInTxxDf8/I2ReM4 30NddqyNPO9cpnXvzykzTmWiO173eRA93dZ1cA1cyoR77SCWkyhe+olDG55yeYNg0VA== X-Gm-Gg: AfdE7cnz0mF057ACIwFz/MPUpjgGy2yt5pUjSTyDQON10t46tVAbgOOH+/+w6RWJ3rY ZWU7C0i+mBR4EJxj3Yk8IP8pDi0V9HtqmtIwEhsb+hpd9qjkAChN5wGzrRWGGdWrPWrqblm7mff K0gl/8qIucpkF/+2Lpd4Ub1MyhWmlqzD5pGCqWbwLsJxt7WaX0Fa10fcH4GFpVv9r/A59YtSUSv war1k7u9QDMw2CEW6cDTRGp2ePwV0Gydmn/ZSKui+PBJbuKabW5kpId9zvEOU8HhWQkNxvtomNH XAsFe1RUO0TA5FOW3KC4i9Vde/BBWhtIMYaj6XNI9q6eKE6ryr3nMEvUF0IL6B1WLHbgrNRg0Xy jljSmS6zHxLfYL17cDBqxcybiVt4DGJ6JOrM2X/Z1ivts0s7HikJuNA95Qg== X-Received: by 2002:ac8:5a04:0:b0:519:f420:d780 with SMTP id d75a77b69052e-5213c7e64a6mr160939101cf.30.1784630456698; Tue, 21 Jul 2026 03:40:56 -0700 (PDT) X-Received: by 2002:ac8:5a04:0:b0:519:f420:d780 with SMTP id d75a77b69052e-5213c7e64a6mr160938961cf.30.1784630456213; Tue, 21 Jul 2026 03:40:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 7/9] hw/sd/sdcard: Fix error case for CMD18 Date: Tue, 21 Jul 2026 12:40:02 +0200 Message-ID: <20260721104004.84934-8-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=BL6DalQG c=1 sm=1 tr=0 ts=6a5f4cb9 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=pGLkceISAAAA:8 a=FRSEYCzRAAAA:8 a=EUspDBNiAAAA:8 a=K2pyRKyQTF4BWjdTM1gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=H4N_Y-AU75W7NKDNhZlT:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfXwCLk/sobtC60 eVY1Du/6snQuBtjtSFHTnuNV2nfQ67O06oE7lnqQI3xTHmysXktxmWuC0C/5qN2SltjguOeNxtM 6vHwdQ7BX0DxL7dCGT+O+Bxh0bU0JtMFTlrY+Nwj4jOQPAysCKGHMA9o2YzgTF5rp/uHSfrtcIa /L2BL9LWXL7zsNfqLlPSjs6dLO42vvQIcHlwhOCpQHdwuy6Uu+0t9tRjkChr4fTIME4Gak9KHKa gBGCQyBN/kY4wAwr8WecKXac2SJCmAXGyuVeoHdS779JEO7+G/Aaz8hpxD+BE98p01M6Or4YUk/ nSEfoNDAaygYJJbOdEnms0m+YULSMwYl9Y2A/04+K/0PAhjIGHYg96Tbnz6wigWoRwA5sPr0slQ +FYSl3cF6DMrqILQiKHOG0ntv+b8iC3ecr5Z0cOT4FcneIO1IiudOEj9Oqh/zzwle4QTXNheKzF JYsTMy3lxGi3WcAzeqA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfXz6RPWi9XdqUq VOkH7u6Eh/9GnpqWD11N84YfQInNdBbin8W/+ITLnHRUSBaYFntbDRShNqBoupPr6u2e+6vKL4K T/IRWykirKHtE4x+kSJ+7K8on1asLA8= X-Proofpoint-ORIG-GUID: -A5JQEjkqq0xEtot8Sq4_NhBuBlXpqOG X-Proofpoint-GUID: -A5JQEjkqq0xEtot8Sq4_NhBuBlXpqOG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630481663158500 From: Bernhard Beschow In commit 468fa450a7e0 ("hw/sd: Switch read/write primitive to buf+len"), `sd_read_byte()` changed its contract to return the read size rather than the read value (and was renamed to `sd_read_data()` accordingly). In an error case, however, `sd_read_data()` returns 0 by means of `dummy_byte` which is the code for the old contract. Moreover, `sdbus_read_data()` asserts the virtual method `read_data()` (and thus `sd_read_data()`) to return a non-zero size, i.e. to make progress and not loop forever. Fix the code to behave like the "DAT read illegal for command" case. Fixes: 468fa450a7e0 ("hw/sd: Switch read/write primitive to buf+len") Reviewed-by: Bin Meng Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260720201133.24796-2-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 33607570043..a30c541df07 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2860,7 +2860,8 @@ static size_t sd_read_data(SDState *sd, void *buf, si= ze_t length) if (sd->data_offset =3D=3D 0) { if (!address_in_range(sd, "READ_MULTIPLE_BLOCK", sd->data_start, io_len)) { - return dummy_byte; + *value =3D dummy_byte; + return length; } partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] & EXT_CSD_PART_CONFIG_ACC_MASK; --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630524; cv=none; d=zohomail.com; s=zohoarc; b=lnCd7i+BLTAVGvBucrXGk5QfKOOwvrehtceFRC43ziKjf4LNW8xXM/wkIlbMHfAJYFLlfRmXoaD2TzpvkmBN7jRybGOnNR/bddJzcxUYrhmIXrrUWqKiEegb+iRZvh+LhIoachMSPz5UWh2mL/8ZWCZWopqaZ8htai74WrmpdrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630524; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9OEdg4Y/czGP7sdFRIVKRI2DQ40/n6xNagJwYMwJZaQ=; b=H4jGKFyLWQFDhUQFOma/2bw/OgLc4o6AqEBu8E1P20R2kWV14x4akDcUxvj0bjaZUJXnw87dBA+wCcd2Pof1ROz5WrJJaPD/AXMLSzgcC5mo0nC8MFYUY3IF/KOjQ4E5p+WeHUR7Rv2iohDwRijXIKu3UZKToBdIMQndOKhSGDU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17846305241361013.1919824586347; Tue, 21 Jul 2026 03:42:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7uQ-0006un-8v; Tue, 21 Jul 2026 06:41:10 -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 1wm7uO-0006mo-6o for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:08 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7uM-0003IX-At for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:07 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LARNdA945886 for ; Tue, 21 Jul 2026 10:41:05 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj1es1shf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:41:04 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c0f0a0760so268544871cf.2 for ; Tue, 21 Jul 2026 03:41:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63ed2314sm1970930f8f.23.2026.07.21.03.41.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 9OEdg4Y/czGP7sdFRIVKRI2DQ40/n6xNagJwYMwJZaQ=; b=WqIhEIPE3VzjITgl hM5mBGdexaqtHmqo1vcwgc1vqQDn4NWGLAJb0YgnjSZluuDucBeyZkpdcEjh0BLQ n5tBRPF/hGn0CD988a2/Avfee0S5x/O4qiKXV9H6En+bKolGVZKcORL65/Wf2nEC b4ikqEhK+j3vsD7bMbYyT7yQ2Qf7oMnGEF/YyBpYqlFdWpMTMbZGOqtdsgE+gFDw edr0r89Kln1ftXcm0DepG01MMr156xizhDlHatGSwaYaDp7e5ZOsbUmP7MCqKspi 9mtYayE3pLbglphz9H7dhawGksU3Z8lS6ewtn1jIF1+brCMBsdd1YlAaRmE2zMOU +ph09g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630464; x=1785235264; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=9OEdg4Y/czGP7sdFRIVKRI2DQ40/n6xNagJwYMwJZaQ=; b=W1fntK+4Gh/Qki+EKgmBtFjQNKxciD4x9+JzCTbc0bXHOe7pjvzBuBB/vtti7IfU9g HgCFFk+yXamEYM/m8FF8FKxZ9a+vAmgrGWKdPLzLx+qv2LQFkHIz82INKInVHFBF/9eJ qi4e0vnw6S3TrlLZhHr9/LOUHmf7hVhjTSXKqCZy5oDV2z2AI42jzsjinM1Vj0kqE9Rk 4lVRyHsgm3vaL7NCQP2p0NlFf5pwcR8dhOHFXKkc1C9QVYtHtFFaKKKlms9dYOo7ciB7 Ae5YBTtPmFsgiyNpbgZESdxJ5kuL5fcgt8Ukn13hlpfBIsl0w5iA02ICxw3WrE70O+yg 6pDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630464; x=1785235264; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=9OEdg4Y/czGP7sdFRIVKRI2DQ40/n6xNagJwYMwJZaQ=; b=KHUhp1rlq2i4WJr2CfwE0+qMyC0wPhAz7EkiLoIQJSnC6ZWDnyG5yV/WaSvdU16TUP GXEAdPA5bo6FsN02VVRFni64jwhXIPaB5Wz7x8RErMR4dHCc+WajT1Ns+CdRf2qDHrNg +7GuTePXudCfCC3OfNn2K4GbK+Zoh7UyV9FnNt5pEkgbNZ8BhJazK79l4DotiQoqj2VR 2NdU2JEwonuzG+z82R+zAdrmKAK5xa9KRyk1U48iaYUj7bIJ6u+bW43pFTi1tPw3WBMx ZrNGljJiApLbIlQVTuJij6zswC1mHoSLGUHdZu2QDNHnkQ9PlTchWCWv8YLGnngcfSG2 5+vA== X-Gm-Message-State: AOJu0YwCTSBeI/tO9GYWEAgKCmdRJiHwn0M4XQ68mKCqzayXGMh9SPPc BEoKPuZG3mEqiaPjZBPN/us21ULFHQAHtC7xHPJgfzndbEdhaCF0egeTQAIbVbmA8bueMDPxtiI xdOAma1r1JXWN/7vkJrBu82S4BQjP8Fq0be3uswvdhM1GRdNn73hlK+pQEoghY4/eiA== X-Gm-Gg: AfdE7cnc7HrJf5VRtxQBc0OttLpaEiUfzRHdp4CRhZS85juWN8z6vqxr24QH8axjVB4 h0NWH5y9/MJiS/hzy5EdQlt+An3o3P416bfJLm4jUIKt0AeAXMD51BWLKRvdHr2u9lv9k1+x++W MTqXIE6hIt/15KqgGSq3jGI1vvupdn3IPjab300YCWfmxJZCF3B/ecCM4Q4MpaqsHgMckMUWkpq Le5Gv9lqZrzJnQPTSi9SuomXf5SoaBAZw9NPMSim1E8waE6jjxtXDy6Pvz4FaePIt4aTlPRFmqI ipJtSsEHV8zSUgJLaIyc1+3wRfFJexOHtMMrpPqeG4MwONrmZVKhefj9QYdjC18ZZ2gbWddURFH ZGNsWez3MuVkZ7G6PU1qnkKUf0Une4sj+pwr5DURdRd6M0hkfNaICwhHEog== X-Received: by 2002:ac8:7c43:0:b0:51b:f0ab:2b1b with SMTP id d75a77b69052e-5213e876ed7mr169973101cf.49.1784630463771; Tue, 21 Jul 2026 03:41:03 -0700 (PDT) X-Received: by 2002:ac8:7c43:0:b0:51b:f0ab:2b1b with SMTP id d75a77b69052e-5213e876ed7mr169972891cf.49.1784630463078; Tue, 21 Jul 2026 03:41:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 8/9] hw/audio/intel-hda: restrict all DMA engine paths to memories Date: Tue, 21 Jul 2026 12:40:03 +0200 Message-ID: <20260721104004.84934-9-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=SPZykuvH c=1 sm=1 tr=0 ts=6a5f4cc0 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=pGLkceISAAAA:8 a=69wJf7TsAAAA:8 a=EUspDBNiAAAA:8 a=wJWD-ArndqrXDSP5iLEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-GUID: 1f1GCh_Zgbsud3xWAlZ3wc1uZ4Q7Hlu7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX0ieT0R9Zc+An +jzuC6w/fHzq/+Ja09r7juvJXEVJZU9BdouCMIaZ8xhUtzX0E+caL1UHkM53ExPd6xJV7PHkFNL Ya+u3Vpc1cCRwY/ejMb9LYtEXl9PhurnVPMNHApFovKwCOeDtIDFRHt/zJgXEBGaNBjjrAQOInS S7cKbnlwObHtVIcl3XojgXTYhm4fLWbg9a2EatTqn/U6seQ2SA64yGTSIKCbJNbEGI0/iNNq2Je XED8jGvEAIcoCQCpZj7LWgPCdvw5U1FcYtYLLfLGL6II3UUMcbLLDdgAsziz7RENhLOH3BQ60FO 3tAqPrad9jr9+VsDhS6YhT1HOjrtwYtgOZp+IV5ljE9vwRb7gAyJn1d7Yazhjyp5G6eT5a0HHTV sx6+rPyRF+wqoVPNxaFl9f34Q7X2LOBXX0X1ld5vjAKDzubdDN8KR+Yu2CA8Ju1VL4Th5WM5FKD hJCsNqJ9KwfrOXOLgOg== X-Proofpoint-ORIG-GUID: 1f1GCh_Zgbsud3xWAlZ3wc1uZ4Q7Hlu7 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX7FB/zto++Mo9 GH3vIej/DK+RJeLnVW+79SSdIzFnxAUel1zJnRURdf2BtwzfXkGVYqr8KmH33JqzwF6Xxj2BbcZ 27ET9KrxP42e91vOjoP546iWPOn/fJ0= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 suspectscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630525807158500 From: Haotian Jiang CVE-2021-3611 (commit 79fa99831d) restricted the DMA engine to memories by setting attrs.memory=3Dtrue, but only applied this to intel_hda_response. Three other DMA engine access points still use MEMTXATTRS_UNSPECIFIED, allowing a malicious guest to trigger DMA-to-self-MMIO reentry: - intel_hda_xfer (line 398): called from the audio timer callback (hda_codec_xfer -> bus->xfer), so the MemReentrancyGuard does not fire (engaged_in_io is false outside MMIO dispatch). A guest that points a BDL entry at the HDA controller's own MMIO BAR can write audio samples to device registers, triggering whandler side effects such as starting/stopping streams or injecting codec commands via CORBWP. - intel_hda_parse_bdl (line 478): uses pci_dma_read which hardcodes MEMTXATTRS_UNSPECIFIED. A guest-controlled BDL base address can point at controller MMIO, allowing the DMA engine to read device registers as BDL descriptors. - intel_hda_corb_run (line 333): ldl_le_pci_dma reads the CORB ring with MEMTXATTRS_UNSPECIFIED, allowing the DMA engine to read controller MMIO as CORB entries. Fix all three by passing {.memory =3D true} explicitly, matching the fix already applied to intel_hda_response. For intel_hda_parse_bdl, replace pci_dma_read with pci_dma_rw to pass the controlled attrs. Fixes: 79fa99831d ("hw/audio/intel-hda: Restrict DMA engine to memories (no= t MMIO devices)") Reported-by: Haotian Jiang of Tencent Security (Yunding Lab) Signed-off-by: Haotian Jiang Cc: qemu-stable@nongnu.org Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260721060941.2989396-1-jianghaotian.sunday@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/intel-hda.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index d7c2c3c2fd4..3d361a4976c 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -305,6 +305,7 @@ static int intel_hda_send_command(IntelHDAState *d, uin= t32_t verb) =20 static void intel_hda_corb_run(IntelHDAState *d) { + const MemTxAttrs attrs =3D { .memory =3D true }; hwaddr addr; uint32_t rp, verb; =20 @@ -330,7 +331,7 @@ static void intel_hda_corb_run(IntelHDAState *d) =20 rp =3D (d->corb_rp + 1) & 0xff; addr =3D intel_hda_addr(d->corb_lbase, d->corb_ubase); - ldl_le_pci_dma(&d->pci, addr + 4 * rp, &verb, MEMTXATTRS_UNSPECIFI= ED); + ldl_le_pci_dma(&d->pci, addr + 4 * rp, &verb, attrs); d->corb_rp =3D rp; =20 dprint(d, 2, "%s: [rp 0x%x] verb 0x%08x\n", __func__, rp, verb); @@ -395,7 +396,7 @@ static void intel_hda_response(HDACodecDevice *dev, boo= l solicited, uint32_t res static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output, uint8_t *buf, uint32_t len) { - const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + const MemTxAttrs attrs =3D { .memory =3D true }; HDACodecBus *bus =3D HDA_BUS(dev->qdev.parent_bus); IntelHDAState *d =3D container_of(bus, IntelHDAState, codecs); hwaddr addr; @@ -466,6 +467,7 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_= t stnr, bool output, =20 static void intel_hda_parse_bdl(IntelHDAState *d, IntelHDAStream *st) { + const MemTxAttrs attrs =3D { .memory =3D true }; hwaddr addr; uint8_t buf[16]; uint32_t i; @@ -475,7 +477,8 @@ static void intel_hda_parse_bdl(IntelHDAState *d, Intel= HDAStream *st) g_free(st->bpl); st->bpl =3D g_new(bpl, st->bentries); for (i =3D 0; i < st->bentries; i++, addr +=3D 16) { - pci_dma_read(&d->pci, addr, buf, 16); + pci_dma_rw(&d->pci, addr, buf, 16, + DMA_DIRECTION_TO_DEVICE, attrs); st->bpl[i].addr =3D le64_to_cpu(*(uint64_t *)buf); st->bpl[i].len =3D le32_to_cpu(*(uint32_t *)(buf + 8)); st->bpl[i].flags =3D le32_to_cpu(*(uint32_t *)(buf + 12)); --=20 2.53.0 From nobody Sat Jul 25 09:32:07 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784630495; cv=none; d=zohomail.com; s=zohoarc; b=K/fArhDu9xf9w4U3jCWi8PcdauXV9o4/QYPDaNT7aqPvEStB8SnpbqjCCBNfQGs895b3eO5hnEn8cmDvJcpcpXSaAoltmpswk/PLg+AO1kiP+p03VJ/+yHXWfaUOM0mdxjSc9YQNX0mRmf8hgW6ejVnnPtdWT8CJnqwf/VgMvyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784630495; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EnKjjXVnCpxSTsSWFNkwK49wXGnwELieAUSstKMZs/o=; b=VrC0ilja5gPtDSZKSOqzBISJXsRzgHPgMHa+Ie57pMvHdRALQwMxObjlusH9pSaTWzcZtheEnjt4ulrCC/zMGcQ3gsuQ2/AeD5qjFp5KbK4RMzRW2udJIU5QJcL0XDsSo1HEsyjLTRlv4F8oLZjYFyJJ82JNKRBQeOuYnWqsx9c= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784630495503960.61208583984; Tue, 21 Jul 2026 03:41:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm7uW-0007bs-Pj; Tue, 21 Jul 2026 06:41:16 -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 1wm7uU-0007VW-Ob for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:14 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wm7uT-0003J3-2c for qemu-devel@nongnu.org; Tue, 21 Jul 2026 06:41:14 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66LARQUx1482264 for ; Tue, 21 Jul 2026 10:41:11 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fhvqnasfc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 10:41:11 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c1a9764f0so226123001cf.1 for ; Tue, 21 Jul 2026 03:41:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4956537c7desm78278315e9.7.2026.07.21.03.41.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 03:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= EnKjjXVnCpxSTsSWFNkwK49wXGnwELieAUSstKMZs/o=; b=QVNjhO3GdOk9QcAX XCI+9Dsr6OEls5C6c8JsI3Bn99Nqcter4SQss8qnJ3QbRTdMjANuMR2dnnbqlnPP zZtTvxS+sHlBm4lKzbNUZkQUoV9Mg0N14N1SoSgG5WqBe2P+ZM/oNHyd6XnTUfNG 55sJtNSJxyPX77A36bzJJ/Y6k1QxhiLTf04ca2wpgEKnX4J4QjctqbUB+nMKskau O8cHSqpFLS9cj6qbdVQtR9Z2tyfQHdWi0ObXYnET1/mHyTe2JEfY5C4wuTN4SUbY l8/oxm0eyKC6y8Ts+C5qlHARonwFIvmDYLCD2n2syFi8MFcwuWQ1qSBTmN3MBV2c rbcu4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784630470; x=1785235270; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EnKjjXVnCpxSTsSWFNkwK49wXGnwELieAUSstKMZs/o=; b=hYwlAE50yzC/5okR9kXJt6MITF8l0BezSEaVpZFDTgF/NCYo/nMUh6Oiy0kk6t/s1V 6TOMw37sHAgQOAE20RAC5IH4zD62N4oGFZNaTUWi3GRH+TKiA+Cv6c98eynu1sZENl/q gK7IVSSILBf7heY6Ucqyfw0SkaT7Pwnvd781PJxP1theW7pFm1hAInUuZgNmOkBsewHU NvvrLEBWCftMR/4zLWWwLA/wNvkkICO/jw+8uLdQC6bDqk05BaRWh8PSXcKddFH95FTH 1gGqHYZwZmrCjudwbaVPo9JcY7qZc/j0jo2CDUS7ObaH8P9McwResI66iqRE3R+qPVz5 APCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630470; x=1785235270; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EnKjjXVnCpxSTsSWFNkwK49wXGnwELieAUSstKMZs/o=; b=ZITlGnrHs+C6V3HkC6VDhbQVg3BuxfcmNY16wkD79WgFpYq7O0O1BZ09J2y1xR0KBp 3fSmqMcSI6apvNDRJLNjxFoFasw7lfebJDTv/UVvRSrVzW9JmXTvZlSsM37SbfqK0gor ydUCISBxyIKanZ+whWunX3v2wuQEp9czT91S4yK1Fcs5PYxT0QH6GdhsZOViVQphL7hb SGp9S/fFGn90I1bnMyKfBrPsB6phz12UmGGOnuas7X5q7xALmPvs2fe/1ecLMzw2h3V7 FbuVWT/XhrQDQcKnFjwT2owQv8fV4QposkvgssJp7Oq9mO/Rl9P0SMu2N3XCHm6KPraB 3q5Q== X-Gm-Message-State: AOJu0Yye0U8ZiT4EpeHSsgxjOWK2NNSm4SJs4NqLOB46frnuofvkaiOK GNIPgn1xT9NB2o7XnUfl3Z8HaMmkGWQ8ZbNCMG4N0LPSt0apnrlowTglaXhwe3oIiuUoY3X2Aaq gAkZCBaR8Tz1g8nisIeOkfWy7JQYIVgrpUV/8srI6ECnYTWFaCwF7Q/QsxxLYLPfYDw== X-Gm-Gg: AfdE7clCMnxiAyMIq0w/vEWEBR6g/1LAW+OnnEK9E1M4eDAuMKbu7KMHMxRww18/QNd HZkIk414zRBxvGAHCWVqDSC4Lsn8MKgN25h4T+N/2nax9atJZIRABFm92AOKv6gbQuDjffqOxDJ lBH1RspIDsOSBnmKO6RrPhUQEdsQVSUsdn4KboEdNnN2rjftSKmyVud5zM6Nhp/GEYIGlpYroQP x77n1Gq/W0YpBGl1XGzm3I82LdLj9CHaIURjGOtKhsm/MZgnC6jEevIfZxicW4pGkN1VejoQo0l dsGTayGIllDgNQ6tjzQAPxstOWH9zTfDy+QecXR6xhGC/pdR9LVYv6m1WE2bFKKBCXwxXm89atU 3NyaEBw6S2/c1P7Ymxaa3LZetUZmyAFn4KoY2DUGOqs0RkhfZG3EOvewF5Q== X-Received: by 2002:a05:622a:1b0b:b0:51c:7b12:5ff6 with SMTP id d75a77b69052e-5213d7a7872mr161875941cf.82.1784630470390; Tue, 21 Jul 2026 03:41:10 -0700 (PDT) X-Received: by 2002:a05:622a:1b0b:b0:51c:7b12:5ff6 with SMTP id d75a77b69052e-5213d7a7872mr161875771cf.82.1784630469937; Tue, 21 Jul 2026 03:41:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 9/9] vfio/listener: Remove unnecessary 'linux/kvm.h' include Date: Tue, 21 Jul 2026 12:40:04 +0200 Message-ID: <20260721104004.84934-10-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721104004.84934-1-philmd@oss.qualcomm.com> References: <20260721104004.84934-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfX9mW9cSr2G/m+ n91E9Hdjpo+oEHywTHaq4rkhejOixQIO+w9Y55uCxqyzN7CfjrHRmvYjnFamtzd0oUpRwpUdwn5 RkDZsGafs/wLnfcuSSa18IepIBFSscs1BdQ0S85GEQ0NWXbSytoV952jxfqjKm0zOAKEab/H2Db HpLuC5CtpSgbMeVm0UiTdjmIA1xzurAmk9W5yVfbuF51zjcxnVuADuW/Kjex+goy4X+WID7Dews 555lJ0jVqQCnxcD2jU00xHs4Tgyz1NJ8KSuTSf/DLhJO51YRYh/YrWRhIoOqMR5ZUQLVVfwcHrF YA5bg6cH5xzPrITdasb72vF6oys+ZmdrVMO7WKYM5Wj3K19deo1/5ZxkPFXr0A8civaOgVTWh+C aRYXPh2k52T5Utl0bsn0b8lKGYOvwDVKu3xo5WUz6AeG3im94xALoMbGVYIAqo9x3uLBvXfOb7X 9OOHeQ7U1hYGqBsPRbw== X-Proofpoint-ORIG-GUID: 9MKUWC4M6eQGh0EESXn6HzQhwPxwZ2ei X-Proofpoint-GUID: 9MKUWC4M6eQGh0EESXn6HzQhwPxwZ2ei X-Authority-Analysis: v=2.4 cv=M5F97Sws c=1 sm=1 tr=0 ts=6a5f4cc7 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=r1p2_3pzAAAA:8 a=9qUTvQc-AAAA:8 a=w_hrQDA7Ve_DKnw8dLkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=r_pkcD-q9-ctt7trBg_g:22 a=axOgMmt4Ejcwn1cqzmsR:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDExMiBTYWx0ZWRfXwvG1NVwtQfeU 2zSQMLhign5o2l6hJexONE4oOWftfQm7hCnQDsbJQHqU3PHWieDH/3ZWcWZN5IR0Crau1uXsCfo ymtTWvkeTpihHDMB++zwSUgbLVAs72E= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 spamscore=0 bulkscore=0 impostorscore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210112 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: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1784630497611158500 From: C=C3=A9dric Le Goater Since commit d0e8bccafc23 ("hw/vfio/listener.c: remove CONFIG_KVM"), the linux/kvm.h include is unconditional. This breaks the build on targets that lack asm/kvm.h such as sparc and sparc64: In file included from ../hw/vfio/listener.c:23: linux-headers/linux/kvm.h:16:10: fatal error: asm/kvm.h: No such file or = directory This include is not needed in listener.c which only uses kvm_enabled() and kvm_get_max_memslots(), both are declared in "system/kvm.h". Remove it. Fixes: d0e8bccafc23 ("hw/vfio/listener.c: remove CONFIG_KVM") Cc: Pierrick Bouvier " Suggested-by: Alex Williamson Signed-off-by: C=C3=A9dric Le Goater Tested-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260721062745.3793066-1-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/listener.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index c19600e980a..008f488a3e7 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -20,7 +20,6 @@ =20 #include "qemu/osdep.h" #include -#include #include =20 #include "exec/target_page.h" --=20 2.53.0