diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-22 17:48:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-21 23:13:23 -0400 |
commit | b5266eb4c8d1a2887a19aaec8144ee4ad1b054c3 (patch) | |
tree | 37105d0640169ad758d20847cf3effe77381f50f /security/selinux | |
parent | 1a60a280778ff90270fc7390d9ec102f713a5a29 (diff) |
[PATCH] switch a bunch of LSM hooks from nameidata to path
Namely, ones from namespace.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/hooks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 1bf2543ea942..38fbb168dbed 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2392,22 +2392,22 @@ static int selinux_sb_statfs(struct dentry *dentry) | |||
2392 | } | 2392 | } |
2393 | 2393 | ||
2394 | static int selinux_mount(char *dev_name, | 2394 | static int selinux_mount(char *dev_name, |
2395 | struct nameidata *nd, | 2395 | struct path *path, |
2396 | char *type, | 2396 | char *type, |
2397 | unsigned long flags, | 2397 | unsigned long flags, |
2398 | void *data) | 2398 | void *data) |
2399 | { | 2399 | { |
2400 | int rc; | 2400 | int rc; |
2401 | 2401 | ||
2402 | rc = secondary_ops->sb_mount(dev_name, nd, type, flags, data); | 2402 | rc = secondary_ops->sb_mount(dev_name, path, type, flags, data); |
2403 | if (rc) | 2403 | if (rc) |
2404 | return rc; | 2404 | return rc; |
2405 | 2405 | ||
2406 | if (flags & MS_REMOUNT) | 2406 | if (flags & MS_REMOUNT) |
2407 | return superblock_has_perm(current, nd->path.mnt->mnt_sb, | 2407 | return superblock_has_perm(current, path->mnt->mnt_sb, |
2408 | FILESYSTEM__REMOUNT, NULL); | 2408 | FILESYSTEM__REMOUNT, NULL); |
2409 | else | 2409 | else |
2410 | return dentry_has_perm(current, nd->path.mnt, nd->path.dentry, | 2410 | return dentry_has_perm(current, path->mnt, path->dentry, |
2411 | FILE__MOUNTON); | 2411 | FILE__MOUNTON); |
2412 | } | 2412 | } |
2413 | 2413 | ||