diff --git a/[refs] b/[refs]
index 216d482d551b..4649510e15d2 100644
--- 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
index f153a8d6e339..2db702d82e7d 100644
--- 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;