Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
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
+3
-3
+3
-3
security/commoncap.c
+3
-3
security/commoncap.c
···
915
915
916
916
/* Ignore non-security xattrs */
917
917
if (strncmp(name, XATTR_SECURITY_PREFIX,
918
-
sizeof(XATTR_SECURITY_PREFIX) - 1) != 0)
918
+
XATTR_SECURITY_PREFIX_LEN) != 0)
919
919
return 0;
920
920
921
921
/*
···
947
947
948
948
/* Ignore non-security xattrs */
949
949
if (strncmp(name, XATTR_SECURITY_PREFIX,
950
-
sizeof(XATTR_SECURITY_PREFIX) - 1) != 0)
950
+
XATTR_SECURITY_PREFIX_LEN) != 0)
951
951
return 0;
952
952
953
953
if (strcmp(name, XATTR_NAME_CAPS) == 0) {
···
1339
1339
1340
1340
#ifdef CONFIG_SECURITY
1341
1341
1342
-
struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
1342
+
static struct security_hook_list capability_hooks[] __lsm_ro_after_init = {
1343
1343
LSM_HOOK_INIT(capable, cap_capable),
1344
1344
LSM_HOOK_INIT(settime, cap_settime),
1345
1345
LSM_HOOK_INIT(ptrace_access_check, cap_ptrace_access_check),