Date: Mon, 24 May 2021 14:06:20 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ef46ce0e29ac - stable/12 - linux: Fix a mistake in commit fb58045145 Message-ID: <202105241406.14OE6Kvo093364@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef46ce0e29ac89daabe3e65efacd57eff02172c1 commit ef46ce0e29ac89daabe3e65efacd57eff02172c1 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-05-17 02:17:53 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-05-24 14:06:16 +0000 linux: Fix a mistake in commit fb58045145 The change to futex_andl_smap() should have ordered stac before the load from a user address, otherwise it does not fix anything. Fixes: fb58045145 ("linux: Fix SMAP-enabled futex routines") Sponsored by: The FreeBSD Foundation (cherry picked from commit 60cb98a1bd2e4ea8fda532261f7211f5d4eba9c0) --- sys/amd64/linux32/linux32_support.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s index f3ec3bd8c776..da076010c13c 100644 --- a/sys/amd64/linux32/linux32_support.s +++ b/sys/amd64/linux32/linux32_support.s @@ -168,8 +168,8 @@ ENTRY(futex_andl_smap) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi ja futex_fault - movl (%rsi),%eax stac + movl (%rsi),%eax 1: movl %eax,%ecx andl %edi,%ecx #ifdef SMP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105241406.14OE6Kvo093364>