From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3217730C160; Fri, 4 Sep 2026 05:40:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500440; cv=none; b=jT4j2wPRcCKw8hn0AYyeO0BKCF3DFkXi0GAY0SUkfMJlwthAML7dZbao96XeREb2/sm9fzaVPMaNNBH1TXy3xH3y0/hNR6FZUYnYSE09KcbzVEAMPVN7BTNa7YZasEj+FublV1tCrCeecA7iFSpk+ipvYE0MtIT1cujdojJ+0KY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500440; c=relaxed/simple; bh=AolyUMRDw7UkRJlwplKa46lyHo9xjcPu+N15Eh59Eo0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q4jzinI728jIZ5IFtvGpUoEH2086Jb77QjlqzEq5uOBShpRVkwkNhj5Kr8UmJJTEbPg9ExlEBLT611tBT/07soS06Z+uAx1KxVVadoAhVixQ/qM9izLn9cKQ4e4VY3Lspjoekmd0SVo5uiTskBuO8ebQQ0xpXGbJYZs16o2KGjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cR5fzKqX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cR5fzKqX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CC0A1F00A3D; Fri, 4 Sep 2026 05:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500439; bh=uPcYzvt0otMrqOIR7fjx09+j6Zp2cphM9mKZNL4Yuf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cR5fzKqXNRjrCVM5qztVTURjN8qvarS7lJkwROIC3KU6faLcx3C1flHBgyOHp0YDY ynMKTTzva1YeS7EMOG1xtqZ0P1/6DkjRhM/7qw6oFuN0eI3fsYUXW3PZ+Iwn2eEOfv Yr5jxOntlaWQpjrLwLPKkomgcA85Te3+9x85ckcE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Borys Tsyrulnikov , "Kiryl Shutsemau (Meta)" , Dave Hansen , Binbin Wu Subject: [PATCH 6.18 056/552] x86/tdx: Fix zero-extension for 32-bit port I/O Date: Fri, 4 Sep 2026 06:53:33 +0200 Message-ID: <20260904045749.115978939@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kiryl Shutsemau (Meta) commit 941370fc93cc3474e26811f4d3b062903eefe2cf upstream. According to x86 architecture rules, 32-bit operations zero-extend the result to 64 bits. The current implementation of handle_in() only masks the lower 32 bits, which preserves the upper 32 bits of RAX when a 32-bit port IN instruction is emulated. Use insn_assign_reg() to write the result back into RAX with proper partial-register-write semantics: 1- and 2-byte forms leave the upper bits untouched, the 4-byte form zero-extends to the full register. Fixes: 03149948832a ("x86/tdx: Port I/O: Add runtime hypercalls") Reported-by: Borys Tsyrulnikov Signed-off-by: Kiryl Shutsemau (Meta) Signed-off-by: Dave Hansen Reviewed-by: Binbin Wu Link: https://lore.kernel.org/all/CAKw_Dz96rfSQc6Rn+9QBcUFHhmkK+9zu+P=bxowfZwxrATCBRg@mail.gmail.com/ Cc:stable@vger.kernel.org Link: https://patch.msgid.link/20260713133753.223947-4-kirill@shutemov.name Signed-off-by: Greg Kroah-Hartman --- arch/x86/coco/tdx/tdx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -693,8 +693,8 @@ static bool handle_in(struct pt_regs *re .r13 = PORT_READ, .r14 = port, }; - u64 mask = GENMASK(BITS_PER_BYTE * size - 1, 0); bool success; + u64 val; /* * Emulate the I/O read via hypercall. More info about ABI can be found @@ -702,11 +702,9 @@ static bool handle_in(struct pt_regs *re * "TDG.VP.VMCALL". */ success = !__tdx_hypercall(&args); + val = success ? args.r11 : 0; - /* Update part of the register affected by the emulated instruction */ - regs->ax &= ~mask; - if (success) - regs->ax |= args.r11 & mask; + insn_assign_reg(®s->ax, val, size); return success; }