1 files changed, 19 insertions, 2 deletions

diff --git a/security/capability.c b/security/capability.c
index 67afc679719a..b6d779b6aa25 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -91,7 +91,10 @@ static int cap_sb_pivotroot(struct path *old_path, struct path *new_path)
 }
 
 static int cap_sb_set_mnt_opts(struct super_block *sb,
-                               struct security_mnt_opts *opts)
+                               struct security_mnt_opts *opts,
+                               unsigned long kern_flags,
+                               unsigned long *set_kern_flags)
+
 {
         if (unlikely(opts->num_mnt_opts))
                 return -EOPNOTSUPP;
@@ -109,6 +112,13 @@ static int cap_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)
         return 0;
 }
 
+static int cap_dentry_init_security(struct dentry *dentry, int mode,
+                                        struct qstr *name, void **ctx,
+                                        u32 *ctxlen)
+{
+        return 0;
+}
+
 static int cap_inode_alloc_security(struct inode *inode)
 {
         return 0;
@@ -822,6 +832,11 @@ static int cap_setprocattr(struct task_struct *p, char *name, void *value,
         return -EINVAL;
 }
 
+static int cap_ismaclabel(const char *name)
+{
+        return 0;
+}
+
 static int cap_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
 {
         return -EOPNOTSUPP;
@@ -849,7 +864,7 @@ static int cap_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen)
 
 static int cap_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
 {
-        return 0;
+        return -EOPNOTSUPP;
 }
 #ifdef CONFIG_KEYS
 static int cap_key_alloc(struct key *key, const struct cred *cred,
@@ -937,6 +952,7 @@ void __init security_fixup_ops(struct security_operations *ops)
         set_to_cap_if_null(ops, sb_set_mnt_opts);
         set_to_cap_if_null(ops, sb_clone_mnt_opts);
         set_to_cap_if_null(ops, sb_parse_opts_str);
+        set_to_cap_if_null(ops, dentry_init_security);
         set_to_cap_if_null(ops, inode_alloc_security);
         set_to_cap_if_null(ops, inode_free_security);
         set_to_cap_if_null(ops, inode_init_security);
@@ -1040,6 +1056,7 @@ void __init security_fixup_ops(struct security_operations *ops)
         set_to_cap_if_null(ops, d_instantiate);
         set_to_cap_if_null(ops, getprocattr);
         set_to_cap_if_null(ops, setprocattr);
+        set_to_cap_if_null(ops, ismaclabel);
         set_to_cap_if_null(ops, secid_to_secctx);
         set_to_cap_if_null(ops, secctx_to_secid);
         set_to_cap_if_null(ops, release_secctx);