diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 18:27:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 18:28:34 -0700 |
| commit | 94bc891b00e40cbec375feb4568780af183fd7f4 (patch) | |
| tree | fd48d354c61d2e736aa593c324a6d794afd8a4e7 /security/selinux | |
| parent | 934b7024f0ed29003c95cef447d92737ab86dc4f (diff) | |
| parent | 1ec7f1ddbe5ba49f7b10c3b129d6d5c90c43526c (diff) | |
| download | linux-3.10-94bc891b00e40cbec375feb4568780af183fd7f4.tar.gz linux-3.10-94bc891b00e40cbec375feb4568780af183fd7f4.tar.bz2 linux-3.10-94bc891b00e40cbec375feb4568780af183fd7f4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
[PATCH] proc_readfd_common() race fix
[PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
[PATCH] teach seq_file to discard entries
[PATCH] umount_tree() will unhash everything itself
[PATCH] get rid of more nameidata passing in namespace.c
[PATCH] switch a bunch of LSM hooks from nameidata to path
[PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
[PATCH] move a bunch of declarations to fs/internal.h
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 33af321f647..308e2cf17d7 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2401,22 +2401,22 @@ static int selinux_sb_statfs(struct dentry *dentry) } static int selinux_mount(char *dev_name, - struct nameidata *nd, + struct path *path, char *type, unsigned long flags, void *data) { int rc; - rc = secondary_ops->sb_mount(dev_name, nd, type, flags, data); + rc = secondary_ops->sb_mount(dev_name, path, type, flags, data); if (rc) return rc; if (flags & MS_REMOUNT) - return superblock_has_perm(current, nd->path.mnt->mnt_sb, + return superblock_has_perm(current, path->mnt->mnt_sb, FILESYSTEM__REMOUNT, NULL); else - return dentry_has_perm(current, nd->path.mnt, nd->path.dentry, + return dentry_has_perm(current, path->mnt, path->dentry, FILE__MOUNTON); } |