1 files changed, 7 insertions, 6 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 155dee600ed..0f928cbba4a 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1928,21 +1928,22 @@ static int proc_readfd_common(struct file * filp, void * dirent,
                             fd++, filp->f_pos++) {
                                char name[PROC_NUMBUF];
                                int len;
+                                int rv;
                                if (!fcheck_files(files, fd))
                                        continue;
                                rcu_read_unlock();
                                len = snprintf(name, sizeof(name), "%d", fd);
-                                if (proc_fill_cache(filp, dirent, filldir,
+                                rv = proc_fill_cache(filp, dirent, filldir,
-                                                    name, len, instantiate,
+                                                     name, len, instantiate, p,
-                                                    p, &fd) < 0) {
+                                                     &fd);
-                                        rcu_read_lock();
+                                if (rv < 0)
-                                        break;
+                                        goto out_fd_loop;
-                                }
                                rcu_read_lock();
                        }
                        rcu_read_unlock();
+out_fd_loop:
                        put_files_struct(files);
        }
 out: