| From 8c8baec451a04075610fa5a654e08e7c731e6dc9 Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Fri, 19 Apr 2013 15:32:32 +0000 |
| Subject: net: fix incorrect credentials passing |
| |
| |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| |
| [ Upstream commit 83f1b4ba917db5dc5a061a44b3403ddb6e783494 ] |
| |
| 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 <luto@amacapital.net> |
| Cc: Eric W. Biederman <ebiederm@xmission.com> |
| Cc: Serge E. Hallyn <serge@hallyn.com> |
| Cc: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/net/scm.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/include/net/scm.h |
| +++ b/include/net/scm.h |
| @@ -56,8 +56,8 @@ static __inline__ void scm_set_cred(stru |
| 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) |
