From: Andrew Morton <akpm@osdl.org>

Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Ulrich Drepper <drepper@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/base.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN fs/proc/base.c~allow-access-to-proc-pid-fd-after-setuid-fix fs/proc/base.c
--- a/fs/proc/base.c~allow-access-to-proc-pid-fd-after-setuid-fix
+++ a/fs/proc/base.c
@@ -1447,6 +1447,10 @@ static const struct file_operations proc
 	.readdir	= proc_readfd,
 };
 
+/*
+ * /proc/pid/fd needs a special permission handler so that a process can still
+ * access /proc/self/fd after it has executed a setuid().
+ */
 static int proc_fd_permission(struct inode *inode, int mask,
 				struct nameidata *nd)
 {
_