Commit 91fa2cca authored by Eric W. Biederman's avatar Eric W. Biederman

userns: Convert devtmpfs to use GLOBAL_ROOT_UID and GLOBAL_ROOT_GID

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent b9b73f7c
...@@ -309,8 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev) ...@@ -309,8 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)
* before unlinking this node, reset permissions * before unlinking this node, reset permissions
* of possible references like hardlinks * of possible references like hardlinks
*/ */
newattrs.ia_uid = 0; newattrs.ia_uid = GLOBAL_ROOT_UID;
newattrs.ia_gid = 0; newattrs.ia_gid = GLOBAL_ROOT_GID;
newattrs.ia_mode = stat.mode & ~0777; newattrs.ia_mode = stat.mode & ~0777;
newattrs.ia_valid = newattrs.ia_valid =
ATTR_UID|ATTR_GID|ATTR_MODE; ATTR_UID|ATTR_GID|ATTR_MODE;
......
...@@ -932,7 +932,6 @@ config UIDGID_CONVERTED ...@@ -932,7 +932,6 @@ config UIDGID_CONVERTED
depends on NET_9P = n depends on NET_9P = n
# Filesystems # Filesystems
depends on DEVTMPFS = n
depends on XENFS = n depends on XENFS = n
depends on 9P_FS = n depends on 9P_FS = n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment