summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-19 15:32:32 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-01 09:41:16 -0700
commitca4bf7c6970aee586c4b6b642e011e3847ac5f93 (patch)
tree5a09c1404e30b8647502300f19516bc6720df17a /include/net
parent4087320fd8d0164c4b53fe5f9c26c0d3eaba7d2d (diff)
downloadlinux-3.10-ca4bf7c6970aee586c4b6b642e011e3847ac5f93.tar.gz
linux-3.10-ca4bf7c6970aee586c4b6b642e011e3847ac5f93.tar.bz2
linux-3.10-ca4bf7c6970aee586c4b6b642e011e3847ac5f93.zip
net: fix incorrect credentials passing
[ 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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/scm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/scm.h b/include/net/scm.h
index 0c0017ce23b..9f211cff93b 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -50,7 +50,7 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm,
{
scm->pid = get_pid(pid);
scm->cred = cred ? get_cred(cred) : NULL;
- cred_to_ucred(pid, cred, &scm->creds);
+ cred_to_ucred(pid, cred, &scm->creds, false);
}
static __inline__ void scm_destroy_cred(struct scm_cookie *scm)