diff options
| author | James Morris <jmorris@namei.org> | 2008-12-25 11:40:09 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-25 11:40:09 +1100 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /include/net | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
| download | linux-3.10-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.gz linux-3.10-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.tar.bz2 linux-3.10-cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/scm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 33e9986beb8..f45bb6eca7d 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -55,8 +55,8 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm) { struct task_struct *p = current; - scm->creds.uid = p->uid; - scm->creds.gid = p->gid; + scm->creds.uid = current_uid(); + scm->creds.gid = current_gid(); scm->creds.pid = task_tgid_vnr(p); scm->fp = NULL; scm->seq = 0; |