Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

Pull capabilities update from James Morris:
 "Minor fixes for capabilities:

   - Update the commoncap.c code to utilize XATTR_SECURITY_PREFIX_LEN,
     from Carmeli tamir.

   - Make the capability hooks static, from Yue Haibing"

* 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security/commoncap: Use xattr security prefix len
  security: Make capability_hooks static

diff --git a/security/commoncap.c b/security/commoncap.c
index c0b9664ee49e378b4a9acd0e2a157d724e5d40d9..f4ee0ae106b282a12adb338f8caa6ce219cfbceb 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -915,7 +915,7 @@ int cap_inode_setxattr(struct dentry *dentry, const char *name,
 
        /* Ignore non-security xattrs */
        if (strncmp(name, XATTR_SECURITY_PREFIX,
-                       sizeof(XATTR_SECURITY_PREFIX) - 1) != 0)
+                       XATTR_SECURITY_PREFIX_LEN) != 0)
                return 0;
 
        /*
@@ -947,7 +947,7 @@ int cap_inode_removexattr(struct dentry *dentry, const char *name)
 
        /* Ignore non-security xattrs */
        if (strncmp(name, XATTR_SECURITY_PREFIX,
-                       sizeof(XATTR_SECURITY_PREFIX) - 1) != 0)
+                       XATTR_SECURITY_PREFIX_LEN) != 0)
                return 0;
 
        if (strcmp(name, XATTR_NAME_CAPS) == 0) {
@@ -1339,7 +1339,7 @@ int cap_mmap_file(struct file *file, unsigned long reqprot,
 
 #ifdef CONFIG_SECURITY
 
-struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
+static struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(capable, cap_capable),
        LSM_HOOK_INIT(settime, cap_settime),
        LSM_HOOK_INIT(ptrace_access_check, cap_ptrace_access_check),