Bump version to 6.12.0-124.56.5

ptrace: kABI-safe replacement of get_dumpable() fix

The previous 124.56.4 shipped the upstream patch 31e62c2ebbfd as-is,
which adds an 'unsigned user_dumpable:1' bit to task_struct. That
layout change broke kABI: the symtype signature of struct task_struct
is referenced by hundreds of stablelist exports, all of which got
flagged by check-kabi during build.

Replace with a minimal kABI-safe slice that only touches
kernel/ptrace.c: when task->mm == NULL, require CAP_SYS_PTRACE in
init_user_ns unconditionally. This closes the Qualys advisory hole
without modifying task_struct or exit_mm(). The behavioural delta vs
upstream is that an already-exited user task whose mm has been
cleared now also requires CAP_SYS_PTRACE.
This commit is contained in:
Andrew Lukoshko 2026-05-15 09:04:17 +00:00 committed by Andrew Lukoshko
parent 9ea2523fb0
commit a9e982b77d
3 changed files with 63 additions and 113 deletions

View File

@ -0,0 +1,55 @@
From: Andrew Lukoshko <alukoshko@almalinux.org>
Subject: [PATCH AlmaLinux 10] ptrace: require CAP_SYS_PTRACE when task has no mm
kABI-safe AlmaLinux backport of upstream commit 31e62c2ebbfd
("ptrace: slightly saner 'get_dumpable()' logic") posted at
https://github.com/torvalds/linux/commit/31e62c2ebbfdc3fe3dbdf5e02c92a9dc67087a3a
The upstream fix adds a 'user_dumpable:1' bit to task_struct and
caches the last dumpability in exit_mm() so __ptrace_may_access()
can require CAP_SYS_PTRACE when the target has no mm (e.g. kernel
threads or already-exited user tasks). That layout change to
task_struct breaks kABI on AlmaLinux 10 (the symtype
signature of struct task_struct is referenced by hundreds of
stablelist exports), so we cannot import the field/exit_mm hunks
as-is.
Take the minimal kABI-safe slice instead: when task->mm == NULL,
require CAP_SYS_PTRACE in init_user_ns unconditionally. This closes
the Qualys Security Advisory hole -- mm-less targets no longer pass
the dumpability check by default -- without touching task_struct or
exit.c. The only behavioural delta versus upstream is that a user
task that has already cleared its mm in exit_mm() (a dying/zombie
task) now also requires CAP_SYS_PTRACE to attach, instead of being
remembered as previously dumpable. Such targets are rarely ptraced
in practice.
Verified to apply with `patch -p1 -F0` (no offset, no fuzz, no rejects)
against kernel-6.12.0-124.56.1.el10_1.
Reported-by: Qualys Security Advisory <qsa@qualys.com>
Signed-off-by: Andrew Lukoshko <alukoshko@almalinux.org>
---
kernel/ptrace.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -339,8 +339,11 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
smp_rmb();
mm = task->mm;
- if (mm &&
- ((get_dumpable(mm) != SUID_DUMP_USER) &&
- !ptrace_has_cap(mm->user_ns, mode)))
- return -EPERM;
+ if (mm) {
+ if ((get_dumpable(mm) != SUID_DUMP_USER) &&
+ !ptrace_has_cap(mm->user_ns, mode))
+ return -EPERM;
+ } else if (!ptrace_has_cap(&init_user_ns, mode)) {
+ return -EPERM;
+ }
return security_ptrace_access_check(task, mode);
--
2.43.0

View File

@ -1,109 +0,0 @@
From: Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH AlmaLinux 10] ptrace: slightly saner 'get_dumpable()' logic
Backport of upstream commit 31e62c2ebbfd ("ptrace: slightly saner
'get_dumpable()' logic") posted at
https://github.com/torvalds/linux/commit/31e62c2ebbfdc3fe3dbdf5e02c92a9dc67087a3a
The 'dumpability' of a task is fundamentally about the memory image of
the task -- the concept comes from whether it can core dump or not --
and makes no sense when you don't have an associated mm.
And almost all users do in fact use it only for the case where the
task has a mm pointer.
But we have one odd special case: ptrace_may_access() uses 'dumpable'
to check various other things entirely independently of the MM
(typically explicitly using flags like PTRACE_MODE_READ_FSCREDS).
Including for threads that no longer have a VM (and maybe never did,
like most kernel threads).
The ptrace code does check that the uid/gid matches, so you do have
to be uid-0 to see kernel thread details, but this means that the
traditional "drop capabilities" model doesn't make any difference
for this all.
Make it all make a bit more sense by saying that if you don't have a
MM pointer, we use a cached "last dumpability" flag if the thread
ever had a MM (it will be zero for kernel threads since it is never
set), and require a proper CAP_SYS_PTRACE capability to override.
Verified to apply with `patch -p1 -F0` (no offset, no fuzz, no rejects)
against kernel-6.12.0-124.56.1.el10_1.
Reported-by: Qualys Security Advisory <qsa@qualys.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Kees Cook <kees@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
include/linux/sched.h | 3 +++
kernel/exit.c | 1 +
kernel/ptrace.c | 22 ++++++++++++++++------
3 files changed, 20 insertions(+), 6 deletions(-)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1007,6 +1007,9 @@ struct task_struct {
unsigned sched_rt_mutex:1;
#endif
+ /* Save user-dumpable when mm goes away */
+ unsigned user_dumpable:1;
+
/* Bit to tell TOMOYO we're in execve(): */
unsigned in_execve:1;
unsigned in_iowait:1;
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -561,6 +561,7 @@ static void exit_mm(void)
*/
smp_mb__after_spinlock();
local_irq_disable();
+ current->user_dumpable = (get_dumpable(mm) == SUID_DUMP_USER);
current->mm = NULL;
membarrier_update_current_mm(NULL);
enter_lazy_tlb(mm, current);
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -272,11 +272,24 @@ static bool ptrace_has_cap(struct user_namespace *ns, unsigned int mode)
return ns_capable(ns, CAP_SYS_PTRACE);
}
+static bool task_still_dumpable(struct task_struct *task, unsigned int mode)
+{
+ struct mm_struct *mm = task->mm;
+ if (mm) {
+ if (get_dumpable(mm) == SUID_DUMP_USER)
+ return true;
+ return ptrace_has_cap(mm->user_ns, mode);
+ }
+
+ if (task->user_dumpable)
+ return true;
+ return ptrace_has_cap(&init_user_ns, mode);
+}
+
/* Returns 0 on success, -errno on denial. */
static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
{
const struct cred *cred = current_cred(), *tcred;
- struct mm_struct *mm;
kuid_t caller_uid;
kgid_t caller_gid;
@@ -337,11 +350,8 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
* Pairs with a write barrier in commit_creds().
*/
smp_rmb();
- mm = task->mm;
- if (mm &&
- ((get_dumpable(mm) != SUID_DUMP_USER) &&
- !ptrace_has_cap(mm->user_ns, mode)))
- return -EPERM;
+ if (!task_still_dumpable(task, mode))
+ return -EPERM;
return security_ptrace_access_check(task, mode);
}
--
2.43.0

View File

@ -176,13 +176,13 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0
%define specversion 6.12.0
%define patchversion 6.12
%define pkgrelease 124.56.4
%define pkgrelease 124.56.5
%define kversion 6
%define tarfile_release 6.12.0-124.56.1.el10_1
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 124.56.4%{?buildid}%{?dist}
%define specrelease 124.56.5%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0-124.56.1.el10_1
@ -1129,7 +1129,7 @@ Patch2008: 0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
Patch2009: 0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
Patch2010: 0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
Patch1100: 1100-net-skbuff-propagate-shared-frag-marker.patch
Patch1101: 1101-ptrace-saner-get_dumpable-logic.patch
Patch1101: 1101-ptrace-require-cap-on-mm-less-task.patch
# END OF PATCH DEFINITIONS
@ -1992,7 +1992,7 @@ ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
ApplyPatch 0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
ApplyPatch 0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
ApplyPatch 1100-net-skbuff-propagate-shared-frag-marker.patch
ApplyPatch 1101-ptrace-saner-get_dumpable-logic.patch
ApplyPatch 1101-ptrace-require-cap-on-mm-less-task.patch
%{log_msg "End of patch applications"}
# END OF PATCH APPLICATIONS
@ -4381,6 +4381,10 @@ fi\
#
#
%changelog
* Fri May 15 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 6.12.0-124.56.5
- ptrace: require CAP_SYS_PTRACE when task has no mm (kABI-safe replacement
for the upstream 31e62c2ebbfd which broke task_struct kABI)
* Fri May 15 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 6.12.0-124.56.4
- ptrace: slightly saner get_dumpable() logic (upstream 31e62c2ebbfd)