commit: 83f1b4ba917db5dc5a061a44b3403ddb6e783494
From: Linus Torvalds <torva...@linux-foundation.org>
Date: Fri, 19 Apr 2013 15:32:32 +0000
Subject: net: fix incorrect credentials passing
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 <l...@amacapital.net>
Cc: Eric W. Biederman <ebied...@xmission.com>
Cc: Serge E. Hallyn <se...@hallyn.com>
Cc: David S. Miller <da...@davemloft.net>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Acked-by: "Eric W. Biederman" <ebied...@xmission.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
---
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 975cca0..b117081 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)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
