Drop pidfs-fix-memory-leak-in-pidfd_info.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.16/pidfs-fix-memory-leak-in-pidfd_info.patch b/queue-6.16/pidfs-fix-memory-leak-in-pidfd_info.patch
deleted file mode 100644 (file)
index 45d99c4..0000000
--- a/queue-6.16/pidfs-fix-memory-leak-in-pidfd_info.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From cc1498c01e878471397ca1bf180751c274c0e168 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 14 Aug 2025 17:44:53 +0800
-Subject: pidfs: Fix memory leak in pidfd_info()
-
-From: Adrian Huang (Lenovo) <adrianhuang0701@gmail.com>
-
-[ Upstream commit 0b2d71a7c82628bb36fd43e80193bcc2693c239a ]
-
-After running the program 'ioctl_pidfd03' of Linux Test Project (LTP) or
-the program 'pidfd_info_test' in 'tools/testing/selftests/pidfd' of the
-kernel source, kmemleak reports the following memory leaks:
-
-  # cat /sys/kernel/debug/kmemleak
-  unreferenced object 0xff110020e5988000 (size 8216):
-    comm "ioctl_pidfd03", pid 10853, jiffies 4294800031
-    hex dump (first 32 bytes):
-      02 40 00 00 00 00 00 00 10 00 00 00 00 00 00 00  .@..............
-      00 00 00 00 af 01 00 00 80 00 00 00 00 00 00 00  ................
-    backtrace (crc 69483047):
-      kmem_cache_alloc_node_noprof+0x2fb/0x410
-      copy_process+0x178/0x1740
-      kernel_clone+0x99/0x3b0
-      __do_sys_clone3+0xbe/0x100
-      do_syscall_64+0x7b/0x2c0
-      entry_SYSCALL_64_after_hwframe+0x76/0x7e
-  ...
-  unreferenced object 0xff11002097b70000 (size 8216):
-  comm "pidfd_info_test", pid 11840, jiffies 4294889165
-  hex dump (first 32 bytes):
-    06 40 00 00 00 00 00 00 10 00 00 00 00 00 00 00  .@..............
-    00 00 00 00 b5 00 00 00 80 00 00 00 00 00 00 00  ................
-  backtrace (crc a6286bb7):
-    kmem_cache_alloc_node_noprof+0x2fb/0x410
-    copy_process+0x178/0x1740
-    kernel_clone+0x99/0x3b0
-    __do_sys_clone3+0xbe/0x100
-    do_syscall_64+0x7b/0x2c0
-    entry_SYSCALL_64_after_hwframe+0x76/0x7e
-  ...
-
-The leak occurs because pidfd_info() obtains a task_struct via
-get_pid_task() but never calls put_task_struct() to drop the reference,
-leaving task->usage unbalanced.
-
-Fix the issue by adding '__free(put_task) = NULL' to the local variable
-'task', ensuring that put_task_struct() is automatically invoked when
-the variable goes out of scope.
-
-Fixes: 7477d7dce48a ("pidfs: allow to retrieve exit information")
-Signed-off-by: Adrian Huang (Lenovo) <adrianhuang0701@gmail.com>
-Link: https://lore.kernel.org/20250814094453.15232-1-adrianhuang0701@gmail.com
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/pidfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fs/pidfs.c b/fs/pidfs.c
-index 568574fed576..1266af5f3a15 100644
---- a/fs/pidfs.c
-+++ b/fs/pidfs.c
-@@ -282,12 +282,12 @@ static __u32 pidfs_coredump_mask(unsigned long mm_flags)
- static long pidfd_info(struct file *file, unsigned int cmd, unsigned long arg)
- {
-       struct pidfd_info __user *uinfo = (struct pidfd_info __user *)arg;
-+      struct task_struct *task __free(put_task) = NULL;
-       struct pid *pid = pidfd_pid(file);
-       size_t usize = _IOC_SIZE(cmd);
-       struct pidfd_info kinfo = {};
-       struct pidfs_exit_info *exit_info;
-       struct user_namespace *user_ns;
--      struct task_struct *task;
-       struct pidfs_attr *attr;
-       const struct cred *c;
-       __u64 mask;
--- 
-2.50.1
-

diff --git a/queue-6.16/series b/queue-6.16/series
index a787c5bb14a0e80e5fea54d7b05debd4b1375f32..dd5d71b4c77fdab7840f048d756fe1425d1b078c 100644 (file)
--- a/queue-6.16/series
+++ b/queue-6.16/series
@@ -285,7 +285,6 @@ fhandle-do_handle_open-should-get-fd-with-user-flags.patch
 libfs-massage-path_from_stashed-to-allow-custom-stas.patch
 pidfs-move-to-anonymous-struct.patch
 pidfs-persist-information.patch
-pidfs-fix-memory-leak-in-pidfd_info.patch
 smb-server-split-ksmbd_rdma_stop_listening-out-of-ks.patch
 fs-buffer-fix-use-after-free-when-call-bh_read-helpe.patch
 signal-fix-memory-leak-for-pidfd_self-sentinels.patch