---

yaml --- r: 362287 b: refs/heads/master c: 0e82e7f h: refs/heads/master i: 362285: 3110112 362283: 50436ff 362279: 19e1e58 362271: 7d4a45c v: v3
git-mirror · Apr 5, 2013 · 542881d · 542881d
1 parent c454e3f
commit 542881d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25da0e3e9d3fb2b522bc2a598076735850310eb1
+refs/heads/master: 0e82e7f6dfeec1013339612f74abc2cdd29d43d2
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
@@ -1993,7 +1993,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 			if ((UNIXCB(skb).pid  != siocb->scm->pid) ||
 			    (UNIXCB(skb).cred != siocb->scm->cred))
 				break;
-		} else {
+		} else if (test_bit(SOCK_PASSCRED, &sock->flags)) {
 			/* Copy credentials */
 			scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred);
 			check_creds = 1;