From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 E9BFB1D5AB1; Thu, 26 Sep 2024 00:17:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727309870; cv=none; b=DIu0I4r03y3FoEhQb8xrmKhn3+nlt8rsqkq0uBvqV+4m2hySvZx+AgPnORuaZv9kI8VRmXNm7acJuSZet5XQzTXeIuvp7maL+R4ywBSWnubxvFJF/B6NsdWNqvYacStemKeXx6vzPWFu8x/3bJ+htskRv4cJA+qmqRhhd14rovc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727309870; c=relaxed/simple; bh=CaKKMg1xLTbWoswsbzfWG2b6ayTsDndLA/HJTNac4pY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nHC0MCUHT+Q/BfH0RauZ7lSmemL/foMDdSJq4Y+SiKA90xX/ZgaccJ0L+HnWtS6lX2FFwVF97wwYQCukLqPN8LC6uzKHWbxvZwUU91/Eppwm/Cbl5SbBeXx2EPa2qQ4FRYGw2vtK4Ed0Kiv5JvU4Hk8inOu9YM86HY5THaZGqwA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YBcveHB+; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YBcveHB+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727309869; x=1758845869; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=CaKKMg1xLTbWoswsbzfWG2b6ayTsDndLA/HJTNac4pY=; b=YBcveHB+0YnynKfmobZijK2ao5fWqqdXajssjZd1v2VnTzWpXwka6njb uyxd71lBAkhuRFOqJeMTgpDmcYV+7R0njW/9kQMIo33+z8SvAAL8LuG5q +3it2A4thSTRe4r/5Wqg6d4XB/6X3soM/lyCIfNj/v+aWoIhZQ/ttJ5da h1dDTOrJOTh+rXD7OpDvHFIa8/884HJ9yiiUYqixdPqB+I1ajayj47tNf GgF3sysbqcK1UPGM4xYccdNHLCtWf6PDQuyj01H40gPUqU+iy/0ZJDAKg 9oVD/xPOdk8V5pAWE/XKWpsrwFaYz8oukjzMkOYs5J4BRWzZVn4fm/XFd A==; X-CSE-ConnectionGUID: qzjKtR2vR1mwB/V24WwkUA== X-CSE-MsgGUID: ged92K+nTze5gV3HbVv6UA== X-IronPort-AV: E=McAfee;i="6700,10204,11206"; a="30272141" X-IronPort-AV: E=Sophos;i="6.10,258,1719903600"; d="scan'208";a="30272141" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 17:17:48 -0700 X-CSE-ConnectionGUID: b0nj5XgSTdm4B6LyEpfBKg== X-CSE-MsgGUID: YtfxfwAqShStmxqkXbrXDw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,258,1719903600"; d="scan'208";a="76461112" Received: from fecarpio-mobl.amr.corp.intel.com (HELO desk) ([10.125.147.229]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 17:17:39 -0700 Date: Wed, 25 Sep 2024 17:17:29 -0700 From: Pawan Gupta To: Andrew Cooper Cc: Borislav Petkov , Dave Hansen , linux-kernel@vger.kernel.org, x86@kernel.org, Robert Gill , Jari Ruusu , Brian Gerst , "Linux regression tracking (Thorsten Leemhuis)" , antonio.gomez.iglesias@linux.intel.com, daniel.sneddon@linux.intel.com, stable@vger.kernel.org Subject: Re: [PATCH v7 3/3] x86/bugs: Use code segment selector for VERW operand Message-ID: <20240926001729.2unwdxtcnnkf3k3t@desk> References: <20240925-fix-dosemu-vm86-v7-0-1de0daca2d42@linux.intel.com> <20240925-fix-dosemu-vm86-v7-3-1de0daca2d42@linux.intel.com> <5703f2d8-7ca0-4f01-a954-c0eb1de930b4@citrix.com> <20240925234616.2ublphj3vbluawb3@desk> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240925234616.2ublphj3vbluawb3@desk> On Wed, Sep 25, 2024 at 04:46:23PM -0700, Pawan Gupta wrote: > On Thu, Sep 26, 2024 at 12:29:00AM +0100, Andrew Cooper wrote: > > On 25/09/2024 11:25 pm, Pawan Gupta wrote: > > > Robert Gill reported below #GP in 32-bit mode when dosemu software was > > > executing vm86() system call: > > > > > > general protection fault: 0000 [#1] PREEMPT SMP > > > CPU: 4 PID: 4610 Comm: dosemu.bin Not tainted 6.6.21-gentoo-x86 #1 > > > Hardware name: Dell Inc. PowerEdge 1950/0H723K, BIOS 2.7.0 10/30/2010 > > > EIP: restore_all_switch_stack+0xbe/0xcf > > > EAX: 00000000 EBX: 00000000 ECX: 00000000 EDX: 00000000 > > > ESI: 00000000 EDI: 00000000 EBP: 00000000 ESP: ff8affdc > > > DS: 0000 ES: 0000 FS: 0000 GS: 0033 SS: 0068 EFLAGS: 00010046 > > > CR0: 80050033 CR2: 00c2101c CR3: 04b6d000 CR4: 000406d0 > > > Call Trace: > > > show_regs+0x70/0x78 > > > die_addr+0x29/0x70 > > > exc_general_protection+0x13c/0x348 > > > exc_bounds+0x98/0x98 > > > handle_exception+0x14d/0x14d > > > exc_bounds+0x98/0x98 > > > restore_all_switch_stack+0xbe/0xcf > > > exc_bounds+0x98/0x98 > > > restore_all_switch_stack+0xbe/0xcf > > > > > > This only happens in 32-bit mode when VERW based mitigations like MDS/RFDS > > > are enabled. This is because segment registers with an arbitrary user value > > > can result in #GP when executing VERW. Intel SDM vol. 2C documents the > > > following behavior for VERW instruction: > > > > > > #GP(0) - If a memory operand effective address is outside the CS, DS, ES, > > > FS, or GS segment limit. > > > > > > CLEAR_CPU_BUFFERS macro executes VERW instruction before returning to user > > > space. Use %cs selector to reference VERW operand. This ensures VERW will > > > not #GP for an arbitrary user %ds. > > > > > > Fixes: a0e2dab44d22 ("x86/entry_32: Add VERW just before userspace transition") > > > Cc: stable@vger.kernel.org # 5.10+ > > > Reported-by: Robert Gill > > > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218707 > > > Closes: https://lore.kernel.org/all/8c77ccfd-d561-45a1-8ed5-6b75212c7a58@leemhuis.info/ > > > Suggested-by: Dave Hansen > > > Suggested-by: Brian Gerst > > > Signed-off-by: Pawan Gupta > > > --- > > > arch/x86/include/asm/nospec-branch.h | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h > > > index ff5f1ecc7d1e..e18a6aaf414c 100644 > > > --- a/arch/x86/include/asm/nospec-branch.h > > > +++ b/arch/x86/include/asm/nospec-branch.h > > > @@ -318,12 +318,14 @@ > > > /* > > > * Macro to execute VERW instruction that mitigate transient data sampling > > > * attacks such as MDS. On affected systems a microcode update overloaded VERW > > > - * instruction to also clear the CPU buffers. VERW clobbers CFLAGS.ZF. > > > + * instruction to also clear the CPU buffers. VERW clobbers CFLAGS.ZF. Using %cs > > > + * to reference VERW operand avoids a #GP fault for an arbitrary user %ds in > > > + * 32-bit mode. > > > * > > > * Note: Only the memory operand variant of VERW clears the CPU buffers. > > > */ > > > .macro CLEAR_CPU_BUFFERS > > > - ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF > > > + ALTERNATIVE "", __stringify(verw %cs:_ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF > > > .endm > > > > People ought rightly to double-take at this using %cs and not %ss.  > > There is a good reason, but it needs describing explicitly.  May I > > suggest the following: > > > > *... > > * In 32bit mode, the memory operand must be a %cs reference.  The data > > segments may not be usable (vm86 mode), and the stack segment may not be > > flat (espfix32). > > *... > > Thanks for the suggestion. I will include this. > > >  .macro CLEAR_CPU_BUFFERS > > #ifdef __x86_64__ > >     ALTERNATIVE "", "verw mds_verw_sel(%rip)", X86_FEATURE_CLEAR_CPU_BUF > > #else > >     ALTERNATIVE "", "verw %cs:mds_verw_sel", X86_FEATURE_CLEAR_CPU_BUF > > #endif > >  .endm > > > > This also lets you drop _ASM_RIP().  It's a cute idea, but is more > > confusion than it's worth, because there's no such thing in 32bit mode. > > > > "%cs:_ASM_RIP(mds_verw_sel)" reads as if it does nothing, because it > > really doesn't in 64bit mode. > > Right, will drop _ASM_RIP() in 32-bit mode and %cs in 64-bit mode. Its probably too soon for next version, pasting the patch here: ---8<--- diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index e18a6aaf414c..4228a1fd2c2e 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -318,14 +318,21 @@ /* * Macro to execute VERW instruction that mitigate transient data sampling * attacks such as MDS. On affected systems a microcode update overloaded VERW - * instruction to also clear the CPU buffers. VERW clobbers CFLAGS.ZF. Using %cs - * to reference VERW operand avoids a #GP fault for an arbitrary user %ds in - * 32-bit mode. + * instruction to also clear the CPU buffers. VERW clobbers CFLAGS.ZF. * * Note: Only the memory operand variant of VERW clears the CPU buffers. */ .macro CLEAR_CPU_BUFFERS - ALTERNATIVE "", __stringify(verw %cs:_ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF +#ifdef CONFIG_X86_64 + ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF +#else + /* + * In 32bit mode, the memory operand must be a %cs reference. The data + * segments may not be usable (vm86 mode), and the stack segment may not + * be flat (ESPFIX32). + */ + ALTERNATIVE "", __stringify(verw %cs:mds_verw_sel), X86_FEATURE_CLEAR_CPU_BUF +#endif .endm #ifdef CONFIG_X86_64