Merge tag 'xtensa-20190510' of git://github.com/jcmvbkbc/linux-xtensa

[sfrench/cifs-2.6.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index 23cbb1a295a361a6be204e6bf5aec4d8971f152a..613a5c00e6029859545066a710bed87e5e9f39c4 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -866,6 +866,11 @@ int security_add_mnt_opt(const char *option, const char *val, int len,
 }
 EXPORT_SYMBOL(security_add_mnt_opt);
 
+int security_move_mount(const struct path *from_path, const struct path *to_path)
+{
+       return call_int_hook(move_mount, 0, from_path, to_path);
+}
+
 int security_inode_alloc(struct inode *inode)
 {
        int rc = lsm_inode_alloc(inode);
@@ -1318,6 +1323,12 @@ int security_inode_copy_up_xattr(const char *name)
 }
 EXPORT_SYMBOL(security_inode_copy_up_xattr);
 
+int security_kernfs_init_security(struct kernfs_node *kn_dir,
+                                 struct kernfs_node *kn)
+{
+       return call_int_hook(kernfs_init_security, 0, kn_dir, kn);
+}
+
 int security_file_permission(struct file *file, int mask)
 {
        int ret;