diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 57e25c962968..94048028bdd1 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -12,6 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/capability.h> | 14 | #include <linux/capability.h> |
15 | #include <linux/dcache.h> | ||
15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
@@ -293,9 +294,12 @@ int security_sb_pivotroot(struct path *old_path, struct path *new_path) | |||
293 | } | 294 | } |
294 | 295 | ||
295 | int security_sb_set_mnt_opts(struct super_block *sb, | 296 | int security_sb_set_mnt_opts(struct super_block *sb, |
296 | struct security_mnt_opts *opts) | 297 | struct security_mnt_opts *opts, |
298 | unsigned long kern_flags, | ||
299 | unsigned long *set_kern_flags) | ||
297 | { | 300 | { |
298 | return security_ops->sb_set_mnt_opts(sb, opts); | 301 | return security_ops->sb_set_mnt_opts(sb, opts, kern_flags, |
302 | set_kern_flags); | ||
299 | } | 303 | } |
300 | EXPORT_SYMBOL(security_sb_set_mnt_opts); | 304 | EXPORT_SYMBOL(security_sb_set_mnt_opts); |
301 | 305 | ||
@@ -324,6 +328,15 @@ void security_inode_free(struct inode *inode) | |||
324 | security_ops->inode_free_security(inode); | 328 | security_ops->inode_free_security(inode); |
325 | } | 329 | } |
326 | 330 | ||
331 | int security_dentry_init_security(struct dentry *dentry, int mode, | ||
332 | struct qstr *name, void **ctx, | ||
333 | u32 *ctxlen) | ||
334 | { | ||
335 | return security_ops->dentry_init_security(dentry, mode, name, | ||
336 | ctx, ctxlen); | ||
337 | } | ||
338 | EXPORT_SYMBOL(security_dentry_init_security); | ||
339 | |||
327 | int security_inode_init_security(struct inode *inode, struct inode *dir, | 340 | int security_inode_init_security(struct inode *inode, struct inode *dir, |
328 | const struct qstr *qstr, | 341 | const struct qstr *qstr, |
329 | const initxattrs initxattrs, void *fs_data) | 342 | const initxattrs initxattrs, void *fs_data) |
@@ -647,6 +660,7 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer | |||
647 | return 0; | 660 | return 0; |
648 | return security_ops->inode_listsecurity(inode, buffer, buffer_size); | 661 | return security_ops->inode_listsecurity(inode, buffer, buffer_size); |
649 | } | 662 | } |
663 | EXPORT_SYMBOL(security_inode_listsecurity); | ||
650 | 664 | ||
651 | void security_inode_getsecid(const struct inode *inode, u32 *secid) | 665 | void security_inode_getsecid(const struct inode *inode, u32 *secid) |
652 | { | 666 | { |
@@ -1047,6 +1061,12 @@ int security_netlink_send(struct sock *sk, struct sk_buff *skb) | |||
1047 | return security_ops->netlink_send(sk, skb); | 1061 | return security_ops->netlink_send(sk, skb); |
1048 | } | 1062 | } |
1049 | 1063 | ||
1064 | int security_ismaclabel(const char *name) | ||
1065 | { | ||
1066 | return security_ops->ismaclabel(name); | ||
1067 | } | ||
1068 | EXPORT_SYMBOL(security_ismaclabel); | ||
1069 | |||
1050 | int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) | 1070 | int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) |
1051 | { | 1071 | { |
1052 | return security_ops->secid_to_secctx(secid, secdata, seclen); | 1072 | return security_ops->secid_to_secctx(secid, secdata, seclen); |