diff options
| -rw-r--r-- | include/linux/socket.h | 1 | ||||
| -rw-r--r-- | include/net/scm.h | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index ad919e0eb1da..2acd2e20847e 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -317,6 +317,7 @@ struct ucred { #define IPX_TYPE 1 extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred); +extern void cred_real_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred); extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len); extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, diff --git a/include/net/scm.h b/include/net/scm.h index 0c0017ce23bb..5da0a7b7eb41 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_real_to_ucred(pid, cred, &scm->creds); } static __inline__ void scm_destroy_cred(struct scm_cookie *scm) diff --git a/net/core/sock.c b/net/core/sock.c index 1e8a88239bb2..2c73adf13ee9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -761,6 +761,20 @@ void cred_to_ucred(struct pid *pid, const struct cred *cred, } EXPORT_SYMBOL_GPL(cred_to_ucred); +void cred_real_to_ucred(struct pid *pid, const struct cred *cred, + struct ucred *ucred) +{ + ucred->pid = pid_vnr(pid); + ucred->uid = ucred->gid = -1; + if (cred) { + struct user_namespace *current_ns = current_user_ns(); + + ucred->uid = user_ns_map_uid(current_ns, cred, cred->uid); + ucred->gid = user_ns_map_gid(current_ns, cred, cred->gid); + } +} +EXPORT_SYMBOL_GPL(cred_real_to_ucred); + int sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) { |