Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1236131

[PATCH 3.16.y-ckt 007/133] xtensa: fix threadptr reload on return to userspace

From Luis Henriques <luis.henriques@canonical.com>
Newsgroups linux.kernel
Subject [PATCH 3.16.y-ckt 007/133] xtensa: fix threadptr reload on return to userspace
Date 2015-09-30 12:50 +0200
Message-ID <qen7s-2yO-31@gated-at.bofh.it> (permalink)
References <qeml5-1mP-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


3.16.7-ckt18 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Max Filippov <jcmvbkbc@gmail.com>

commit 4229fb12a03e5da5882b420b0aa4a02e77447b86 upstream.

Userspace return code may skip restoring THREADPTR register if there are
no registers that need to be zeroed. This leads to spurious failures in
libc NPTL tests.

Always restore THREADPTR on return to userspace.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 arch/xtensa/kernel/entry.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index a06b7efaae82..8a749f02d8d6 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -568,12 +568,13 @@ user_exception_exit:
 	 *	 (if we have restored WSBITS-1 frames).
 	 */
 
+2:
 #if XCHAL_HAVE_THREADPTR
 	l32i	a3, a1, PT_THREADPTR
 	wur	a3, threadptr
 #endif
 
-2:	j	common_exception_exit
+	j	common_exception_exit
 
 	/* This is the kernel exception exit.
 	 * We avoided to do a MOVSP when we entered the exception, but we
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[3.16.y-ckt stable] Linux 3.16.7-ckt18 stable review Luis Henriques <luis.henriques@canonical.com> - 2015-09-30 12:50 +0200
  [PATCH 3.16.y-ckt 001/133] ipv6: addrconf: validate new MTU before applying it Luis Henriques <luis.henriques@canonical.com> - 2015-09-30 12:50 +0200
  [PATCH 3.16.y-ckt 007/133] xtensa: fix threadptr reload on return to userspace Luis Henriques <luis.henriques@canonical.com> - 2015-09-30 12:50 +0200
  [PATCH 3.16.y-ckt 006/133] HID: cp2112: fix byte order in SMBUS operations Luis Henriques <luis.henriques@canonical.com> - 2015-09-30 12:50 +0200

csiph-web