---

yaml --- r: 234287 b: refs/heads/master c: 326be7b h: refs/heads/master i: 234285: fc59d6c 234283: 16cc277 234279: 7554331 234271: 6613994 v: v3
git-mirror · Mar 15, 2011 · cc5eaf9 · cc5eaf9
1 parent 1531ed7
commit cc5eaf9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65cfc6722361570bfe255698d9cd4dccaf47570d
+refs/heads/master: 326be7b484843988afe57566b627fb7a70beac56
diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c
@@ -305,6 +305,8 @@ struct file *fget_raw(unsigned int fd)
 	return file;
 }
 
+EXPORT_SYMBOL(fget_raw);
+
 /*
  * Lightweight file lookup - no refcnt increment if fd table isn't shared.
  *

diff --git a/trunk/net/core/scm.c b/trunk/net/core/scm.c
@@ -95,7 +95,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)
 		int fd = fdp[i];
 		struct file *file;
 
-		if (fd < 0 || !(file = fget(fd)))
+		if (fd < 0 || !(file = fget_raw(fd)))
 			return -EBADF;
 		*fpp++ = file;
 		fpl->count++;

diff --git a/trunk/net/unix/garbage.c b/trunk/net/unix/garbage.c
@@ -104,7 +104,7 @@ struct sock *unix_get_socket(struct file *filp)
 	/*
 	 *	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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -305,6 +305,8 @@ struct file *fget_raw(unsigned int fd) @@
     	return file;
     }
+    EXPORT_SYMBOL(fget_raw);
     /*
      * Lightweight file lookup - no refcnt increment if fd table isn't shared.
      *
@@ Expand Down @@