diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-08 00:46:26 +0100 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 23:59:29 +0200 |
commit | ab27b91b9f1937ddb9e0eb0d0892728f852b48cf (patch) | |
tree | 399f8665e6a0c4e0780bea20437bd7834c672db7 | |
parent | userns: Convert sysctl permission checks to use kuid and kgids. (diff) | |
download | linux-ab27b91b9f1937ddb9e0eb0d0892728f852b48cf.tar.xz linux-ab27b91b9f1937ddb9e0eb0d0892728f852b48cf.zip |
userns: Convert sysfs to use kgid/kuid where appropriate
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r-- | fs/sysfs/inode.c | 4 | ||||
-rw-r--r-- | init/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index feb2d69396cf..907c2b3af758 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c @@ -62,8 +62,8 @@ static struct sysfs_inode_attrs *sysfs_init_inode_attrs(struct sysfs_dirent *sd) /* assign default attributes */ iattrs->ia_mode = sd->s_mode; - iattrs->ia_uid = 0; - iattrs->ia_gid = 0; + iattrs->ia_uid = GLOBAL_ROOT_UID; + iattrs->ia_gid = GLOBAL_ROOT_GID; iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME; return attrs; diff --git a/init/Kconfig b/init/Kconfig index be587651b952..908e61cd0b0e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -952,7 +952,6 @@ config UIDGID_CONVERTED depends on QNX6FS_FS = n depends on REISERFS_FS = n depends on SQUASHFS = n - depends on SYSFS = n depends on SYSV_FS = n depends on TMPFS = n depends on UBIFS_FS = n |