summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-12-19 10:44:42 +1100
committerJames Morris <jmorris@namei.org>2008-12-20 09:02:39 +1100
commit12204e24b1330428c3062faee10a0d80b8a5cb61 (patch)
treed92ee705a86f0ec2bf85c8a797239dbb840d5927 /security
parent459c19f524a9d89c65717a7d061d5f11ecf6bcb8 (diff)
downloadlinux-3.10-12204e24b1330428c3062faee10a0d80b8a5cb61.tar.gz
linux-3.10-12204e24b1330428c3062faee10a0d80b8a5cb61.tar.bz2
linux-3.10-12204e24b1330428c3062faee10a0d80b8a5cb61.zip
security: pass mount flags to security_sb_kern_mount()
Pass mount flags to security_sb_kern_mount(), so security modules can determine if a mount operation is being performed by the kernel. Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Diffstat (limited to 'security')
-rw-r--r--security/capability.c2
-rw-r--r--security/security.c4
-rw-r--r--security/selinux/hooks.c2
-rw-r--r--security/smack/smack_lsm.c3
4 files changed, 6 insertions, 5 deletions
diff --git a/security/capability.c b/security/capability.c
index b9e391425e6..2dce66fcb99 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -59,7 +59,7 @@ static int cap_sb_copy_data(char *orig, char *copy)
return 0;
}
-static int cap_sb_kern_mount(struct super_block *sb, void *data)
+static int cap_sb_kern_mount(struct super_block *sb, int flags, void *data)
{
return 0;
}
diff --git a/security/security.c b/security/security.c
index f0d96a6cc4e..d85dbb37c97 100644
--- a/security/security.c
+++ b/security/security.c
@@ -254,9 +254,9 @@ int security_sb_copy_data(char *orig, char *copy)
}
EXPORT_SYMBOL(security_sb_copy_data);
-int security_sb_kern_mount(struct super_block *sb, void *data)
+int security_sb_kern_mount(struct super_block *sb, int flags, void *data)
{
- return security_ops->sb_kern_mount(sb, data);
+ return security_ops->sb_kern_mount(sb, flags, data);
}
int security_sb_show_options(struct seq_file *m, struct super_block *sb)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 8dbc54cde59..7465d713b53 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2474,7 +2474,7 @@ out:
return rc;
}
-static int selinux_sb_kern_mount(struct super_block *sb, void *data)
+static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data)
{
const struct cred *cred = current_cred();
struct avc_audit_data ad;
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 8ad48161cef..1b5551dfc1f 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -250,11 +250,12 @@ static int smack_sb_copy_data(char *orig, char *smackopts)
/**
* smack_sb_kern_mount - Smack specific mount processing
* @sb: the file system superblock
+ * @flags: the mount flags
* @data: the smack mount options
*
* Returns 0 on success, an error code on failure
*/
-static int smack_sb_kern_mount(struct super_block *sb, void *data)
+static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
{
struct dentry *root = sb->s_root;
struct inode *inode = root->d_inode;