Subject: net: fix incorrect credentials passing

From: Linus Torvalds <[email-masked]>
Date: Fri, 19 Apr 2013 18:32:32 -0700 (PDT)

Commit 257b5358b32f ("scm: Capture the full credentials of the scm 
sender") changed the credentials passing code to pass in the effective 
uid/gid instead of the real uid/gid.

Obviously this doesn't matter most of the time (since normally they are 
the same), but it results in differences for suid binaries when the wrong 
uid/gid ends up being used.

This just undoes that (presumably unintentional) part of the commit.

Reported-by: Andy Lutomirski <[email-masked]>
Cc: Eric W. Biederman <[email-masked]>
Cc: Serge E. Hallyn <[email-masked]>
Cc: David S. Miller <[email-masked]>
Cc: [email-masked]
Signed-off-by: Linus Torvalds <[email-masked]>
---

 include/net/scm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/scm.h b/include/net/scm.h
index 975cca01048b..b11708105681 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -56,8 +56,8 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm,
 	scm->pid  = get_pid(pid);
 	scm->cred = cred ? get_cred(cred) : NULL;
 	scm->creds.pid = pid_vnr(pid);
-	scm->creds.uid = cred ? cred->euid : INVALID_UID;
-	scm->creds.gid = cred ? cred->egid : INVALID_GID;
+	scm->creds.uid = cred ? cred->uid : INVALID_UID;
+	scm->creds.gid = cred ? cred->gid : INVALID_GID;
 }
 
 static __inline__ void scm_destroy_cred(struct scm_cookie *scm)