Skip to content

Commit

Permalink
net: fix incorrect credentials passing (CVE-2013-1979)
Browse files Browse the repository at this point in the history
Commit 257b535 ("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>
Cc: stable@vger.kernel.org
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>

(cherry picked from commit 83f1b4b)
CVE-2013-1979
BugLink: https://launchpad.net/bugs/1174827
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  • Loading branch information
torvalds authored and rtg-canonical committed Apr 30, 2013
1 parent 84d7cd2 commit 6ed61f4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/net/scm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6ed61f4

Please sign in to comment.