From: "Eric W. Biederman" <[email protected]>

Cc: Greg Kroah-Hartman <[email protected]>
Acked-by: Serge Hallyn <[email protected]>
Signed-off-by: Eric W. Biederman <[email protected]>
---
 drivers/base/devtmpfs.c |    4 ++--
 init/Kconfig            |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index deb4a45..147d1a4 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 e7e0cc1..96007af 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
-- 
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to