From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2244GJ6Zl3wi042rs/wbpuJQgVIuiCq+XTclkDphiPDR9vcJwpShhodyFd0XBrM72boU//rm ARC-Seal: i=1; a=rsa-sha256; t=1519217808; cv=none; d=google.com; s=arc-20160816; b=ZS2L11wUNapLxs2geYEDnrU3lCUDTAFMmzwGJw8HSVXcYZdbegg8RY8okcYJ5mH62u 4TYky3JkofmJ/wpvsDpmKmpJ3uSIUBTMvZVloQ6atFU8DWMz1F/ymzmDA5JpQrMQilM6 3HGgS+rKZqx1azF56zgz5ZMYoy4JmKITSKnJ/Vm4EglX6SnHjBamJuGlH9N0n5yKeraI CT8JyYuVO3wUO5+ROfLjgVOgXcFJzqdwhC8gdzvtgDLWTdnM1LWDinpF4sbVV3adqQCe 9K2Ek6mnurkjUnjQgSVTu3ndcFBqNaq7guVSs4YLKfPZkCY23bAOQ5qr6yGq74R31JL3 rIFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wOV7net1OsVCIEkGpcMtx8y3j7Ml9Z6s7pUIUSpVo04=; b=c2pWWgB6h413wekXFCh94u3eerP/QFHiHSkq9XqiuLapDinOI9e2ajQ+EiNHTc9zZV wtaNBpc+5utRWTIo0SZmS3Tx+98uiqMA1xXPoh9FV4jFzSoPd6JvHK3uPkDxP2PMX1mI ayccjanTgFitUmK30uM2W/sdSfNbMSLBAgFrNgM/QHPAu1s5oWTogFXQm2vuKSOToSlT rBmJct7a9XvC9x7cC1Yg83tvSpP+QKOPDotYd+UzauGznQhrUUow/SIo9Fq8wmEPJ0oy mtILu1TRbjitjDMkgKMeccYt5h8Xhtvk+FzGLHA5SLNyNbMLCihrzSTP+XZCyOo54hmC 0RFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rui Wang , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , dave.hansen@linux.intel.com, Ingo Molnar Subject: [PATCH 4.9 63/77] selftests/x86/mpx: Fix incorrect bounds with old _sigfault Date: Wed, 21 Feb 2018 13:49:12 +0100 Message-Id: <20180221124434.872265094@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124432.172390020@linuxfoundation.org> References: <20180221124432.172390020@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1593015332922490474?= X-GMAIL-MSGID: =?utf-8?q?1593015332922490474?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rui Wang commit 961888b1d76d84efc66a8f5604b06ac12ac2f978 upstream. 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. Signed-off-by: Rui Wang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: dave.hansen@linux.intel.com Fixes: e754aedc26ef ("x86/mpx, selftests: Add MPX self test") Link: http://lkml.kernel.org/r/1513586050-1641-1-git-send-email-rui.y.wang@intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/mpx-mini-test.c | 32 ++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) --- a/tools/testing/selftests/x86/mpx-mini-test.c +++ b/tools/testing/selftests/x86/mpx-mini-test.c @@ -315,11 +315,39 @@ static inline void *__si_bounds_upper(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(si static inline void *__si_bounds_upper(siginfo_t *si) { - return (*__si_bounds_hack(si)) + sizeof(void *); + return *(__si_bounds_hack(si) + 1); } #endif