x86/mpx/selftests: Fix wrong bounds with old _sigfault
PATCH 1/1 x86/mpx/selftests: Fix wrong bounds with old _sigfault
I fixed this on my machine and forgot to tell anyone until a recent bug report. The patch almost get lost. Archiving it here.
For distributions with old userspace header files, the _sigfault structure is different. mpx-mini-test fails with the following error:
[root@Purley]# mpx-mini-test_64 tabletest XSAVE is supported by HW & OS XSAVE processor supported state mask: 0x2ff XSAVE OS supported state mask: 0x2ff BNDREGS: size: 64 user: 1 supervisor: 0 aligned: 0 BNDCSR: size: 64 user: 1 supervisor: 0 aligned: 0 starting mpx bounds table test ERROR: siginfo bounds do not match shadow bounds for register 0
Fix it by using the correct offset of _lower/_upper in _sigfault. RHEL needs this patch to work.
--- tools/testing/selftests/x86/mpx-mini-test.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-)
tools/testing/selftests/x86/mpx-mini-test.c +25 -2
@@ -315,11 +315,34 @@ static uint64_t read_mpx_status_sig(ucontext_t *uctxt) return si->si_upper; }#else + +/* This deals with old version of _sigfault in some distros +old _sigfault: +struct { +void *si_addr; +} _sigfault; + +new _sigfault: +struct { +void __user *_addr; +int _trapno; +short _addr_lsb; +union { +struct { +void __user *_lower; +void __user *_upper; +} _addr_bnd; +__u32 _pkey; +}; +} _sigfault; +*/ static inline void **__si_bounds_hack (siginfo_t *si) {void *sigfault = &si->_sifields._sigfault;void *end_sigfault = sigfault +sizeof (si->_sifields._sigfault); -void **__si_lower = end_sigfault; +int *trapno = (int *)end_sigfault; +/* skip _trapno and _addr_lsb */ +void **__si_lower = (void **)(trapno +2 );return __si_lower; }
@@ -331,7 +354,7 @@ static uint64_t read_mpx_status_sig(ucontext_t *uctxt)static inline void *__si_bounds_upper (siginfo_t *si) { -return (*__si_bounds_hack (si)) +sizeof (void *); +return *(__si_bounds_hack (si) +1 ); }#endif
Signature · 1 line
1.7.5.4
tip-bot for Rui Wang
merge bot[tip:x86/pti] selftests/x86/mpx: Fix incorrect bounds with old _sigfault
selftests/x86/mpx: Fix incorrect bounds with old _sigfault
Commit-ID: d101567aec6653cc372af3b9b957299fee06cca8 Gitweb: https://git.kernel.org/tip/d101567aec6653cc372af3b9b957299fee06cca8 Author: Rui Wang <[email protected]> AuthorDate: Mon, 18 Dec 2017 16:34:10 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 13 Feb 2018 19:20:05 +0100
selftests/x86/mpx: Fix incorrect bounds with old _sigfault
For distributions with old userspace header files, the _sigfault structure is different. mpx-mini-test fails with the following error:
[root@Purley]# mpx-mini-test_64 tabletest
XSAVE is supported by HW & OS
XSAVE processor supported state mask: 0x2ff
XSAVE OS supported state mask: 0x2ff
BNDREGS: size: 64 user: 1 supervisor: 0 aligned: 0
BNDCSR: size: 64 user: 1 supervisor: 0 aligned: 0
starting mpx bounds table test
ERROR: siginfo bounds do not match shadow bounds for register 0Fix it by using the correct offset of _lower/_upper in _sigfault. RHEL needs this patch to work.
--- tools/testing/selftests/x86/mpx-mini-test.c | 32 +++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
tools/testing/selftests/x86/mpx-mini-test.c +30 -2
@@ -315,11 +315,39 @@ static inline void *__si_bounds_upper(siginfo_t *si) return si->si_upper; }#else + +/* +* This deals with old version of _sigfault in some distros: +* + +old _sigfault: +struct { +void *si_addr; +} _sigfault; + +new _sigfault: +struct { +void __user *_addr; +int _trapno; +short _addr_lsb; +union { +struct { +void __user *_lower; +void __user *_upper; +} _addr_bnd; +__u32 _pkey; +}; +} _sigfault; +* +*/ +static inline void **__si_bounds_hack (siginfo_t *si) {void *sigfault = &si->_sifields._sigfault;void *end_sigfault = sigfault +sizeof (si->_sifields._sigfault); -void **__si_lower = end_sigfault; +int *trapno = (int *)end_sigfault; +/* skip _trapno and _addr_lsb */ +void **__si_lower = (void **)(trapno +2 );return __si_lower; }
@@ -331,7 +359,7 @@ static inline void *__si_bounds_lower(siginfo_t *si)static inline void *__si_bounds_upper (siginfo_t *si) { -return (*__si_bounds_hack (si)) +sizeof (void *); +return *(__si_bounds_hack (si) +1 ); }#endif
tip-bot for Rui Wang
merge bot[tip:x86/pti] selftests/x86/mpx: Fix incorrect bounds with old _sigfault
In reply to Rui Wangselftests/x86/mpx: Fix incorrect bounds with old _sigfault
Commit-ID: 961888b1d76d84efc66a8f5604b06ac12ac2f978 Gitweb: https://git.kernel.org/tip/961888b1d76d84efc66a8f5604b06ac12ac2f978 Author: Rui Wang <[email protected]> AuthorDate: Mon, 18 Dec 2017 16:34:10 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 15 Feb 2018 01:15:52 +0100
selftests/x86/mpx: Fix incorrect bounds with old _sigfault
For distributions with old userspace header files, the _sigfault structure is different. mpx-mini-test fails with the following error:
[root@Purley]# mpx-mini-test_64 tabletest
XSAVE is supported by HW & OS
XSAVE processor supported state mask: 0x2ff
XSAVE OS supported state mask: 0x2ff
BNDREGS: size: 64 user: 1 supervisor: 0 aligned: 0
BNDCSR: size: 64 user: 1 supervisor: 0 aligned: 0
starting mpx bounds table test
ERROR: siginfo bounds do not match shadow bounds for register 0Fix it by using the correct offset of _lower/_upper in _sigfault. RHEL needs this patch to work.
--- tools/testing/selftests/x86/mpx-mini-test.c | 32 +++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
tools/testing/selftests/x86/mpx-mini-test.c +30 -2
@@ -315,11 +315,39 @@ static inline void *__si_bounds_upper(siginfo_t *si) return si->si_upper; }#else + +/* +* This deals with old version of _sigfault in some distros: +* + +old _sigfault: +struct { +void *si_addr; +} _sigfault; + +new _sigfault: +struct { +void __user *_addr; +int _trapno; +short _addr_lsb; +union { +struct { +void __user *_lower; +void __user *_upper; +} _addr_bnd; +__u32 _pkey; +}; +} _sigfault; +* +*/ +static inline void **__si_bounds_hack (siginfo_t *si) {void *sigfault = &si->_sifields._sigfault;void *end_sigfault = sigfault +sizeof (si->_sifields._sigfault); -void **__si_lower = end_sigfault; +int *trapno = (int *)end_sigfault; +/* skip _trapno and _addr_lsb */ +void **__si_lower = (void **)(trapno +2 );return __si_lower; }
@@ -331,7 +359,7 @@ static inline void *__si_bounds_lower(siginfo_t *si)static inline void *__si_bounds_upper (siginfo_t *si) { -return (*__si_bounds_hack (si)) +sizeof (void *); +return *(__si_bounds_hack (si) +1 ); }#endif