diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:27:36 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:27:36 +1100 |
commit | 01cb8a720027d65f683c4806a72faa7cd2d720f3 (patch) | |
tree | 3b529b0e6d50376f4b1a023838b64161606cc8ea /include | |
parent | dacdf13105780666348116d92893157dc04b5382 (diff) | |
parent | e2241be62deabe09d7c681326fcb0bc707082147 (diff) |
Merge remote-tracking branch 'security/next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/lsm_hooks.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 558adfa5c8a8..0f3c309065d7 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -352,8 +352,7 @@ * Return 0 if permission is granted. * @inode_getattr: * Check permission before obtaining file attributes. - * @mnt is the vfsmount where the dentry was looked up - * @dentry contains the dentry structure for the file. + * @path contains the path structure for the file. * Return 0 if permission is granted. * @inode_setxattr: * Check permission before setting the extended attributes @@ -1876,6 +1875,7 @@ struct security_hook_list { struct list_head list; struct list_head *head; union security_list_options hook; + char *lsm; }; /* @@ -1888,15 +1888,10 @@ struct security_hook_list { { .head = &security_hook_heads.HEAD, .hook = { .HEAD = HOOK } } extern struct security_hook_heads security_hook_heads; +extern char *lsm_names; -static inline void security_add_hooks(struct security_hook_list *hooks, - int count) -{ - int i; - - for (i = 0; i < count; i++) - list_add_tail_rcu(&hooks[i].list, hooks[i].head); -} +extern void security_add_hooks(struct security_hook_list *hooks, int count, + char *lsm); #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* |