summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-04-25 15:25:35 +0400
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 14:13:05 +0400
commit91fa2ccaa87368314527ea7518c545063662d67f (patch)
treee3de87321060f6eb460cf50b3bf9e0651b7ffa09
parentb9b73f7c4d45d69289aa16620b04430068dd3941 (diff)
downloadlinux-91fa2ccaa87368314527ea7518c545063662d67f.tar.xz
userns: Convert devtmpfs to use GLOBAL_ROOT_UID and GLOBAL_ROOT_GID
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--drivers/base/devtmpfs.c4
-rw-r--r--init/Kconfig1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index deb4a456cf83..147d1a4dd269 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -309,8 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)
* before unlinking this node, reset permissions
* of possible references like hardlinks
*/
- newattrs.ia_uid = 0;
- newattrs.ia_gid = 0;
+ newattrs.ia_uid = GLOBAL_ROOT_UID;
+ newattrs.ia_gid = GLOBAL_ROOT_GID;
newattrs.ia_mode = stat.mode & ~0777;
newattrs.ia_valid =
ATTR_UID|ATTR_GID|ATTR_MODE;
diff --git a/init/Kconfig b/init/Kconfig
index e7e0cc15ef68..96007af67645 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -932,7 +932,6 @@ config UIDGID_CONVERTED
depends on NET_9P = n
# Filesystems
- depends on DEVTMPFS = n
depends on XENFS = n
depends on 9P_FS = n