summaryrefslogtreecommitdiff
path: root/fs/pidfs.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 10:55:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 10:55:57 +0200
commita83c371c4b6c9e5cc11391ee6e56543a0fef59b9 (patch)
treec88b27a7b15946f922612945c0808caef6cee8ab /fs/pidfs.c
parentf72b9aa821a2bfe4b6dfec4be19f264d0673b008 (diff)
parent89be9a83ccf1f88522317ce02f854f30d6115c41 (diff)
Merge tag 'v6.16-rc7' into usb-next
We need the USB/Thunderbolt fixes in here for other patches to be on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pidfs.c')
-rw-r--r--fs/pidfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pidfs.c b/fs/pidfs.c
index 69919be1c9d8..4625e097e3a0 100644
--- a/fs/pidfs.c
+++ b/fs/pidfs.c
@@ -319,7 +319,7 @@ static long pidfd_info(struct file *file, unsigned int cmd, unsigned long arg)
if (!c)
return -ESRCH;
- if (!(kinfo.mask & PIDFD_INFO_COREDUMP)) {
+ if ((kinfo.mask & PIDFD_INFO_COREDUMP) && !(kinfo.coredump_mask)) {
task_lock(task);
if (task->mm)
kinfo.coredump_mask = pidfs_coredump_mask(task->mm->flags);