Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index f372d9bf497675a436aa2cbc7cba00b5464faf9b..653f8c0aedc54aafb08c6f451157f7ca7e432efa 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -813,8 +813,8 @@ void cred_to_ucred(struct pid *pid, const struct cred *cred,
        if (cred) {
                struct user_namespace *current_ns = current_user_ns();
 
-               ucred->uid = user_ns_map_uid(current_ns, cred, cred->euid);
-               ucred->gid = user_ns_map_gid(current_ns, cred, cred->egid);
+               ucred->uid = from_kuid(current_ns, cred->euid);
+               ucred->gid = from_kgid(current_ns, cred->egid);
        }
 }
 EXPORT_SYMBOL_GPL(cred_to_ucred);