The patch titled
procfs: Fix listing of /proc/NOT_A_TGID/task
has been added to the -mm tree. Its filename is
procfs-fix-listing-of-proc-not_a_tgid-task.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: procfs: Fix listing of /proc/NOT_A_TGID/task
From: Guillaume Chazarain <guichaz@xxxxxxxx>
Listing /proc/PID/task were PID is not a TGID should not result in
duplicated entries.
[g ~]$ pidof thunderbird-bin
2751
[g ~]$ ls /proc/2751/task
2751 2770 2771 2824 2826 2834 2835 2851 2853
[g ~]$ ls /proc/2770/task
2751 2770 2771 2824 2826 2834 2835 2851 2853
2770 2771 2824 2826 2834 2835 2851 2853
[g ~]$
Signed-off-by: Guillaume Chazarain <guichaz@xxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/proc/base.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletion(-)
diff -puN fs/proc/base.c~procfs-fix-listing-of-proc-not_a_tgid-task fs/proc/base.c
--- a/fs/proc/base.c~procfs-fix-listing-of-proc-not_a_tgid-task
+++ a/fs/proc/base.c
@@ -2332,13 +2332,23 @@ static int proc_task_readdir(struct file
{
struct dentry *dentry = filp->f_path.dentry;
struct inode *inode = dentry->d_inode;
- struct task_struct *leader = get_proc_task(inode);
+ struct task_struct *leader = NULL;
struct task_struct *task;
int retval = -ENOENT;
ino_t ino;
int tid;
unsigned long pos = filp->f_pos; /* avoiding "long long" filp->f_pos */
+ task = get_proc_task(inode);
+ if (!task)
+ goto out_no_task;
+ rcu_read_lock();
+ if (pid_alive(task)) {
+ leader = task->group_leader;
+ get_task_struct(leader);
+ }
+ rcu_read_unlock();
+ put_task_struct(task);
if (!leader)
goto out_no_task;
retval = 0;
_
Patches currently in -mm which might be from guichaz@xxxxxxxx are
procfs-fix-listing-of-proc-not_a_tgid-task.patch
factor-outstanding-i-o-error-handling.patch
factor-outstanding-i-o-error-handling-tidy.patch
sync_sb_inodes-propagate-errors.patch
block_write_full_page-handle-enospc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
