From: "Iván Ezequiel Rodriguez" <ivanrwcm25@gmail.com>
To: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org
Cc: "H . Peter Anvin" <hpa@zytor.com>,
"Shuah Khan" <shuah@kernel.org>,
"Christian Brauner" <brauner@kernel.org>,
"Rick Edgecombe" <rick.p.edgecombe@intel.com>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
"Iván Ezequiel Rodriguez" <ivanrwcm25@gmail.com>
Subject: [PATCH v2 0/2] x86/shstk: don't leak a shadow stack when clone TLS fails
Date: Thu, 22 Oct 2026 19:17:19 -0300 [thread overview]
Message-ID: <20261022221722.619233-1-ivanrwcm25@gmail.com> (raw)
In-Reply-To: <20261015023147.519257-1-ivanrwcm25@gmail.com>
copy_thread() maps a shadow stack and set_new_tls() can still fail.
That error goes to bad_fork_cleanup_io and skips exit_thread().
bad_fork_cleanup_thread calls exit_thread() only after copy_thread()
has returned 0.
commit 748c90c69336 ("x86/shstk: Remove useless clone error handling")
removed the shstk_free() on the set_new_tls() failure. Restoring it
only there puts back the single free. The allocation-error return
still aliases the parent, and the exit_thread() path is left alone,
so the double unmap that commit avoided does not come back.
The selftest uses kselftest.h / KTAP. Feature and clone3 availability
skips run before ksft_set_plan(). Missing /proc/self/smaps is SKIP.
Read errors, truncated smaps lines, and a VMA range without VmFlags
are FAIL. A valid-TLS clone3 must succeed before EPERM on a bad TLS
counts as the leak path; ENOSYS/EPERM/EACCES SKIP that control.
Regression (CONFIG_X86_USER_SHADOW_STACK=y, host and one-vCPU KVM
-cpu host,migratable=off):
Scenario Without fix With fix
16 bad-TLS clone3 +16 ss VMAs +0 ss VMAs
Parent shadow stack kept + call/ret OK kept + call/ret OK
KTAP 2/3 (test 3 fail) 3/3 pass
Changes in v2:
- Nest the TLS error check under CLONE_SETTLS, as suggested by Rick
Edgecombe.
- Use a dedicated shadow-stack cleanup label.
- Return zero explicitly on the successful path.
- Remove the redundant cleanup comment.
- Selftest: rewrite on kselftest.h / KTAP (plan 3). Fix RDSSPQ
comment; align get_ssp() with test_shadow_stack; SKIP only
ENOSYS/EPERM/EACCES on the valid-TLS control; FAIL on truncated or
incomplete smaps records that would under-count ss VMAs.
Link: https://lore.kernel.org/lkml/20261015023147.519257-1-ivanrwcm25@gmail.com/
Iván Ezequiel Rodriguez (2):
x86/shstk: free shadow stack when copy_thread() fails
selftests/x86: shadow stack must survive a bad TLS
arch/x86/kernel/process.c | 13 +-
tools/testing/selftests/x86/Makefile | 3 +-
tools/testing/selftests/x86/shstk_clone_tls.c | 334 ++++++++++++++++++
3 files changed, 346 insertions(+), 4 deletions(-)
create mode 100644 tools/testing/selftests/x86/shstk_clone_tls.c
--
2.43.0
next prev parent reply other threads:[~2026-10-22 22:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-15 2:31 [PATCH " Iván Ezequiel Rodriguez
2026-10-15 2:31 ` [PATCH 1/2] x86/shstk: free shadow stack when copy_thread() fails Iván Ezequiel Rodriguez
2026-10-21 19:26 ` Edgecombe, Rick P
2026-10-15 2:31 ` [PATCH 2/2] selftests/x86: shadow stack must survive a bad TLS Iván Ezequiel Rodriguez
2026-10-22 22:17 ` Iván Ezequiel Rodriguez [this message]
2026-10-22 22:17 ` [PATCH v2 1/2] x86/shstk: free shadow stack when copy_thread() fails Iván Ezequiel Rodriguez
2026-10-22 22:17 ` [PATCH v2 2/2] selftests/x86: shadow stack must survive a bad TLS Iván Ezequiel Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261022221722.619233-1-ivanrwcm25@gmail.com \
--to=ivanrwcm25@gmail.com \
--cc=bp@alien8.de \
--cc=brauner@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rick.p.edgecombe@intel.com \
--cc=shuah@kernel.org \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®