diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-25 04:25:35 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 03:13:05 -0700 |
| commit | 91fa2ccaa87368314527ea7518c545063662d67f (patch) | |
| tree | e3de87321060f6eb460cf50b3bf9e0651b7ffa09 | |
| parent | b9b73f7c4d45d69289aa16620b04430068dd3941 (diff) | |
| download | linux-3.10-91fa2ccaa87368314527ea7518c545063662d67f.tar.gz linux-3.10-91fa2ccaa87368314527ea7518c545063662d67f.tar.bz2 linux-3.10-91fa2ccaa87368314527ea7518c545063662d67f.zip | |
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.c | 4 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index deb4a456cf8..147d1a4dd26 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 e7e0cc15ef6..96007af6764 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 |