summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorTim Chen <tim.c.chen@linux.intel.com>2011-08-09 06:48:32 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:54 -0700
commit265d5c2eb22550566cf4193df46596dac439374c (patch)
tree26ea2ddaf5eb4967e072f3c5559d7a9732044edf /net/core
parent5c97f6d48701d464dfd6e8782399383686603b65 (diff)
scm: Capture the full credentials of the scm sender
[ Upstream commit e33f7a9f37d486f4c6cce5de18a6eea11d68f64f ] This patch corrects an erroneous update of credential's gid with uid introduced in commit 257b5358b32f17 since 2.6.36. Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Reviewed-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/scm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/scm.c b/net/core/scm.c
index 4c1ef026d695..811b53fb330e 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -192,7 +192,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
goto error;
cred->uid = cred->euid = p->creds.uid;
- cred->gid = cred->egid = p->creds.uid;
+ cred->gid = cred->egid = p->creds.gid;
put_cred(p->cred);
p->cred = cred;
}