diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/capability.c | 6 | ||||
-rw-r--r-- | security/security.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/security/capability.c b/security/capability.c index 85b67c8632df..ab3d807accc3 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -54,6 +54,11 @@ static int cap_sb_copy_data(char *orig, char *copy) | |||
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
56 | 56 | ||
57 | static int cap_sb_remount(struct super_block *sb, void *data) | ||
58 | { | ||
59 | return 0; | ||
60 | } | ||
61 | |||
57 | static int cap_sb_kern_mount(struct super_block *sb, int flags, void *data) | 62 | static int cap_sb_kern_mount(struct super_block *sb, int flags, void *data) |
58 | { | 63 | { |
59 | return 0; | 64 | return 0; |
@@ -887,6 +892,7 @@ void __init security_fixup_ops(struct security_operations *ops) | |||
887 | set_to_cap_if_null(ops, sb_alloc_security); | 892 | set_to_cap_if_null(ops, sb_alloc_security); |
888 | set_to_cap_if_null(ops, sb_free_security); | 893 | set_to_cap_if_null(ops, sb_free_security); |
889 | set_to_cap_if_null(ops, sb_copy_data); | 894 | set_to_cap_if_null(ops, sb_copy_data); |
895 | set_to_cap_if_null(ops, sb_remount); | ||
890 | set_to_cap_if_null(ops, sb_kern_mount); | 896 | set_to_cap_if_null(ops, sb_kern_mount); |
891 | set_to_cap_if_null(ops, sb_show_options); | 897 | set_to_cap_if_null(ops, sb_show_options); |
892 | set_to_cap_if_null(ops, sb_statfs); | 898 | set_to_cap_if_null(ops, sb_statfs); |
diff --git a/security/security.c b/security/security.c index 8f28685ee0d9..b1d6134548bc 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -267,6 +267,11 @@ int security_sb_copy_data(char *orig, char *copy) | |||
267 | } | 267 | } |
268 | EXPORT_SYMBOL(security_sb_copy_data); | 268 | EXPORT_SYMBOL(security_sb_copy_data); |
269 | 269 | ||
270 | int security_sb_remount(struct super_block *sb, void *data) | ||
271 | { | ||
272 | return security_ops->sb_remount(sb, data); | ||
273 | } | ||
274 | |||
270 | int security_sb_kern_mount(struct super_block *sb, int flags, void *data) | 275 | int security_sb_kern_mount(struct super_block *sb, int flags, void *data) |
271 | { | 276 | { |
272 | return security_ops->sb_kern_mount(sb, flags, data); | 277 | return security_ops->sb_kern_mount(sb, flags, data); |