aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-06-23 05:02:58 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:42:45 -0400
commit726c334223180e3c0197cc980a432681370d4baf (patch)
tree8327b354bb3dc959a6606051ae6f8d4d035e38a2 /security/selinux
parent454e2398be9b9fa30433fccc548db34d19aa9958 (diff)
[PATCH] VFS: Permit filesystem to perform statfs with a known root dentry
Give the statfs superblock operation a dentry pointer rather than a superblock pointer. This complements the get_sb() patch. That reduced the significance of sb->s_root, allowing NFS to place a fake root there. However, NFS does require a dentry to use as a target for the statfs operation. This permits the root in the vfsmount to be used instead. linux/mount.h has been added where necessary to make allyesconfig build successfully. Interest has also been expressed for use with the FUSE and XFS filesystems. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Nathan Scott <nathans@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 524915dfda64..093efba4d9b6 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1903,13 +1903,13 @@ static int selinux_sb_kern_mount(struct super_block *sb, void *data)
1903 return superblock_has_perm(current, sb, FILESYSTEM__MOUNT, &ad); 1903 return superblock_has_perm(current, sb, FILESYSTEM__MOUNT, &ad);
1904} 1904}
1905 1905
1906static int selinux_sb_statfs(struct super_block *sb) 1906static int selinux_sb_statfs(struct dentry *dentry)
1907{ 1907{
1908 struct avc_audit_data ad; 1908 struct avc_audit_data ad;
1909 1909
1910 AVC_AUDIT_DATA_INIT(&ad,FS); 1910 AVC_AUDIT_DATA_INIT(&ad,FS);
1911 ad.u.fs.dentry = sb->s_root; 1911 ad.u.fs.dentry = dentry->d_sb->s_root;
1912 return superblock_has_perm(current, sb, FILESYSTEM__GETATTR, &ad); 1912 return superblock_has_perm(current, dentry->d_sb, FILESYSTEM__GETATTR, &ad);
1913} 1913}
1914 1914
1915static int selinux_mount(char * dev_name, 1915static int selinux_mount(char * dev_name,