diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 2 | ||||
-rw-r--r-- | security/security.c | 4 | ||||
-rw-r--r-- | security/selinux/hooks.c | 2 | ||||
-rw-r--r-- | security/smack/smack_lsm.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/security/capability.c b/security/capability.c index b9e391425e6f..2dce66fcb992 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -59,7 +59,7 @@ static int cap_sb_copy_data(char *orig, char *copy) | |||
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | static int cap_sb_kern_mount(struct super_block *sb, void *data) | 62 | static int cap_sb_kern_mount(struct super_block *sb, int flags, void *data) |
63 | { | 63 | { |
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
diff --git a/security/security.c b/security/security.c index f0d96a6cc4e9..d85dbb37c972 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -254,9 +254,9 @@ int security_sb_copy_data(char *orig, char *copy) | |||
254 | } | 254 | } |
255 | EXPORT_SYMBOL(security_sb_copy_data); | 255 | EXPORT_SYMBOL(security_sb_copy_data); |
256 | 256 | ||
257 | int security_sb_kern_mount(struct super_block *sb, void *data) | 257 | int security_sb_kern_mount(struct super_block *sb, int flags, void *data) |
258 | { | 258 | { |
259 | return security_ops->sb_kern_mount(sb, data); | 259 | return security_ops->sb_kern_mount(sb, flags, data); |
260 | } | 260 | } |
261 | 261 | ||
262 | int security_sb_show_options(struct seq_file *m, struct super_block *sb) | 262 | 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 8dbc54cde59e..7465d713b531 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2474,7 +2474,7 @@ out: | |||
2474 | return rc; | 2474 | return rc; |
2475 | } | 2475 | } |
2476 | 2476 | ||
2477 | static int selinux_sb_kern_mount(struct super_block *sb, void *data) | 2477 | static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data) |
2478 | { | 2478 | { |
2479 | const struct cred *cred = current_cred(); | 2479 | const struct cred *cred = current_cred(); |
2480 | struct avc_audit_data ad; | 2480 | struct avc_audit_data ad; |
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 8ad48161cef5..1b5551dfc1f7 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) | |||
250 | /** | 250 | /** |
251 | * smack_sb_kern_mount - Smack specific mount processing | 251 | * smack_sb_kern_mount - Smack specific mount processing |
252 | * @sb: the file system superblock | 252 | * @sb: the file system superblock |
253 | * @flags: the mount flags | ||
253 | * @data: the smack mount options | 254 | * @data: the smack mount options |
254 | * | 255 | * |
255 | * Returns 0 on success, an error code on failure | 256 | * Returns 0 on success, an error code on failure |
256 | */ | 257 | */ |
257 | static int smack_sb_kern_mount(struct super_block *sb, void *data) | 258 | static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data) |
258 | { | 259 | { |
259 | struct dentry *root = sb->s_root; | 260 | struct dentry *root = sb->s_root; |
260 | struct inode *inode = root->d_inode; | 261 | struct inode *inode = root->d_inode; |