From 47a8c6df573438e3c9dd518601df0a4c76f13399 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 8 May 2007 00:25:47 -0700 Subject: [PATCH] --- yaml --- r: 54579 b: refs/heads/master c: 59cd0cbc75367b82f704f63b104117462275060d h: refs/heads/master i: 54577: c73ae8379d305d17587989a31ac66099110347d4 54575: d781d05f360a69321be46ebc9fab9908a9dd5cb7 v: v3 --- [refs] | 2 +- trunk/fs/proc/generic.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 711928885521..f7b24d06bcc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7695650a924a6859910c8c19dfa43b4d08224d66 +refs/heads/master: 59cd0cbc75367b82f704f63b104117462275060d diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c index 22a08ff3475d..8a40e15f5ecb 100644 --- a/trunk/fs/proc/generic.c +++ b/trunk/fs/proc/generic.c @@ -478,14 +478,21 @@ int proc_readdir(struct file * filp, } do { + struct proc_dir_entry *next; + /* filldir passes info to user space */ + de_get(de); spin_unlock(&proc_subdir_lock); if (filldir(dirent, de->name, de->namelen, filp->f_pos, - de->low_ino, de->mode >> 12) < 0) + de->low_ino, de->mode >> 12) < 0) { + de_put(de); goto out; + } spin_lock(&proc_subdir_lock); filp->f_pos++; - de = de->next; + next = de->next; + de_put(de); + de = next; } while (de); spin_unlock(&proc_subdir_lock); }