From 542881d478c81894935cfb8380a731c586ab77fd Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 3 Apr 2013 16:14:47 +0000
Subject: [PATCH] --- yaml --- r: 362287 b: refs/heads/master c:
 0e82e7f6dfeec1013339612f74abc2cdd29d43d2 h: refs/heads/master i:   362285:
 3110112f51361ca0fb985c4b440ef203f088e3f7   362283:
 50436ff6f856268320446796b89eb0962c96ccfd   362279:
 19e1e580878b303541f4527cae0cc238fde23c03   362271:
 7d4a45c6ed74b715b8545b69a3342e0ec043dec0 v: v3

---
 [refs]                   | 2 +-
 trunk/net/unix/af_unix.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;