commit 326be7b484843988afe57566b627fb7a70beac56
author Al Viro <viro@zeniv.linux.org.uk> Sun Mar 13 17:08:22 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Mar 15 02:21:45 2011 -0400
tree 04a15bfdb681ad09444cf2f3d72ae0d38fb0432b
parent 65cfc6722361570bfe255698d9cd4dccaf47570d

Allow passing O_PATH descriptors via SCM_RIGHTS datagrams

Just need to make sure that AF_UNIX garbage collector won't
confuse O_PATHed socket on filesystem for real AF_UNIX opened
socket.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

net/unix/garbage.c

diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index f89f83b..b6f4b99 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -104,7 +104,7 @@
 	/*
 	 *	Socket ?
 	 */
-	if (S_ISSOCK(inode->i_mode)) {
+	if (S_ISSOCK(inode->i_mode) && !(filp->f_mode & FMODE_PATH)) {
 		struct socket *sock = SOCKET_I(inode);
 		struct sock *s = sock->sk;