| Message ID | 20211213234034.111891-2-casey@schaufler-ca.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | [v31,01/28] integrity: disassociate ima_filter_rule from security_audit_rule | expand |
Hi Casey,
I love your patch! Yet something to improve:
[auto build test ERROR on nf-next/master]
[also build test ERROR on nf/master linus/master jmorris-security/next-testing v5.16-rc5]
[cannot apply to pcmoore-audit/next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Casey-Schaufler/integrity-disassociate-ima_filter_rule-from-security_audit_rule/20211214-084057
base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master
config: openrisc-randconfig-r012-20211213 (https://download.01.org/0day-ci/archive/20211214/202112142134.jipW98iP-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/dcedf3ce1784c565747e19c7917ddbcd3422b821
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Casey-Schaufler/integrity-disassociate-ima_filter_rule-from-security_audit_rule/20211214-084057
git checkout dcedf3ce1784c565747e19c7917ddbcd3422b821
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=openrisc SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
security/integrity/ima/ima_policy.c: In function 'ima_lsm_free_rule':
>> security/integrity/ima/ima_policy.c:360:17: error: implicit declaration of function 'ima_filter_rule_free'; did you mean 'ima_file_free'? [-Werror=implicit-function-declaration]
360 | ima_filter_rule_free(entry->lsm[i].rule);
| ^~~~~~~~~~~~~~~~~~~~
| ima_file_free
security/integrity/ima/ima_policy.c: In function 'ima_lsm_copy_rule':
>> security/integrity/ima/ima_policy.c:409:17: error: implicit declaration of function 'ima_filter_rule_init' [-Werror=implicit-function-declaration]
409 | ima_filter_rule_init(nentry->lsm[i].type, Audit_equal,
| ^~~~~~~~~~~~~~~~~~~~
security/integrity/ima/ima_policy.c: In function 'ima_match_rules':
>> security/integrity/ima/ima_policy.c:625:30: error: implicit declaration of function 'ima_filter_rule_match' [-Werror=implicit-function-declaration]
625 | rc = ima_filter_rule_match(osid, rule->lsm[i].type,
| ^~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +360 security/integrity/ima/ima_policy.c
176377d97d6a3f Tyler Hicks 2020-08-11 354
b169424551930a Janne Karhunen 2019-06-14 355 static void ima_lsm_free_rule(struct ima_rule_entry *entry)
b169424551930a Janne Karhunen 2019-06-14 356 {
b169424551930a Janne Karhunen 2019-06-14 357 int i;
b169424551930a Janne Karhunen 2019-06-14 358
b169424551930a Janne Karhunen 2019-06-14 359 for (i = 0; i < MAX_LSM_RULES; i++) {
b8867eedcf76ca Tyler Hicks 2020-07-10 @360 ima_filter_rule_free(entry->lsm[i].rule);
b169424551930a Janne Karhunen 2019-06-14 361 kfree(entry->lsm[i].args_p);
b169424551930a Janne Karhunen 2019-06-14 362 }
465aee77aae857 Tyler Hicks 2020-07-09 363 }
465aee77aae857 Tyler Hicks 2020-07-09 364
465aee77aae857 Tyler Hicks 2020-07-09 365 static void ima_free_rule(struct ima_rule_entry *entry)
465aee77aae857 Tyler Hicks 2020-07-09 366 {
465aee77aae857 Tyler Hicks 2020-07-09 367 if (!entry)
465aee77aae857 Tyler Hicks 2020-07-09 368 return;
465aee77aae857 Tyler Hicks 2020-07-09 369
465aee77aae857 Tyler Hicks 2020-07-09 370 /*
465aee77aae857 Tyler Hicks 2020-07-09 371 * entry->template->fields may be allocated in ima_parse_rule() but that
465aee77aae857 Tyler Hicks 2020-07-09 372 * reference is owned by the corresponding ima_template_desc element in
465aee77aae857 Tyler Hicks 2020-07-09 373 * the defined_templates list and cannot be freed here
465aee77aae857 Tyler Hicks 2020-07-09 374 */
465aee77aae857 Tyler Hicks 2020-07-09 375 kfree(entry->fsname);
176377d97d6a3f Tyler Hicks 2020-08-11 376 ima_free_rule_opt_list(entry->keyrings);
465aee77aae857 Tyler Hicks 2020-07-09 377 ima_lsm_free_rule(entry);
b169424551930a Janne Karhunen 2019-06-14 378 kfree(entry);
b169424551930a Janne Karhunen 2019-06-14 379 }
b169424551930a Janne Karhunen 2019-06-14 380
b169424551930a Janne Karhunen 2019-06-14 381 static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry)
b169424551930a Janne Karhunen 2019-06-14 382 {
b169424551930a Janne Karhunen 2019-06-14 383 struct ima_rule_entry *nentry;
483ec26eed42bf Janne Karhunen 2020-01-15 384 int i;
b169424551930a Janne Karhunen 2019-06-14 385
b169424551930a Janne Karhunen 2019-06-14 386 /*
b169424551930a Janne Karhunen 2019-06-14 387 * Immutable elements are copied over as pointers and data; only
b169424551930a Janne Karhunen 2019-06-14 388 * lsm rules can change
b169424551930a Janne Karhunen 2019-06-14 389 */
f60c826d031817 Alex Dewar 2020-09-09 390 nentry = kmemdup(entry, sizeof(*nentry), GFP_KERNEL);
f60c826d031817 Alex Dewar 2020-09-09 391 if (!nentry)
f60c826d031817 Alex Dewar 2020-09-09 392 return NULL;
f60c826d031817 Alex Dewar 2020-09-09 393
c593642c8be046 Pankaj Bharadiya 2019-12-09 394 memset(nentry->lsm, 0, sizeof_field(struct ima_rule_entry, lsm));
b169424551930a Janne Karhunen 2019-06-14 395
b169424551930a Janne Karhunen 2019-06-14 396 for (i = 0; i < MAX_LSM_RULES; i++) {
483ec26eed42bf Janne Karhunen 2020-01-15 397 if (!entry->lsm[i].args_p)
b169424551930a Janne Karhunen 2019-06-14 398 continue;
b169424551930a Janne Karhunen 2019-06-14 399
b169424551930a Janne Karhunen 2019-06-14 400 nentry->lsm[i].type = entry->lsm[i].type;
39e5993d0d452b Tyler Hicks 2020-07-09 401 nentry->lsm[i].args_p = entry->lsm[i].args_p;
39e5993d0d452b Tyler Hicks 2020-07-09 402 /*
39e5993d0d452b Tyler Hicks 2020-07-09 403 * Remove the reference from entry so that the associated
39e5993d0d452b Tyler Hicks 2020-07-09 404 * memory will not be freed during a later call to
39e5993d0d452b Tyler Hicks 2020-07-09 405 * ima_lsm_free_rule(entry).
39e5993d0d452b Tyler Hicks 2020-07-09 406 */
39e5993d0d452b Tyler Hicks 2020-07-09 407 entry->lsm[i].args_p = NULL;
b169424551930a Janne Karhunen 2019-06-14 408
b8867eedcf76ca Tyler Hicks 2020-07-10 @409 ima_filter_rule_init(nentry->lsm[i].type, Audit_equal,
b169424551930a Janne Karhunen 2019-06-14 410 nentry->lsm[i].args_p,
b169424551930a Janne Karhunen 2019-06-14 411 &nentry->lsm[i].rule);
483ec26eed42bf Janne Karhunen 2020-01-15 412 if (!nentry->lsm[i].rule)
483ec26eed42bf Janne Karhunen 2020-01-15 413 pr_warn("rule for LSM \'%s\' is undefined\n",
aa0c0227d33171 Tyler Hicks 2020-07-09 414 nentry->lsm[i].args_p);
b169424551930a Janne Karhunen 2019-06-14 415 }
b169424551930a Janne Karhunen 2019-06-14 416 return nentry;
b169424551930a Janne Karhunen 2019-06-14 417 }
b169424551930a Janne Karhunen 2019-06-14 418
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/include/linux/security.h b/include/linux/security.h index bbf44a466832..71eac35bfa21 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1917,6 +1917,32 @@ static inline void security_audit_rule_free(void *lsmrule) #endif /* CONFIG_SECURITY */ #endif /* CONFIG_AUDIT */ +#ifdef CONFIG_IMA_LSM_RULES +#ifdef CONFIG_SECURITY +int ima_filter_rule_init(u32 field, u32 op, char *rulestr, void **lsmrule); +int ima_filter_rule_match(u32 secid, u32 field, u32 op, void *lsmrule); +void ima_filter_rule_free(void *lsmrule); + +#else + +static inline int ima_filter_rule_init(u32 field, u32 op, char *rulestr, + void **lsmrule) +{ + return 0; +} + +static inline int ima_filter_rule_match(u32 secid, u32 field, u32 op, + void *lsmrule) +{ + return 0; +} + +static inline void ima_filter_rule_free(void *lsmrule) +{ } + +#endif /* CONFIG_SECURITY */ +#endif /* CONFIG_IMA_LSM_RULES */ + #ifdef CONFIG_SECURITYFS extern struct dentry *securityfs_create_file(const char *name, umode_t mode, diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index be965a8715e4..1b5d70ac2dc9 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -418,32 +418,6 @@ static inline void ima_free_modsig(struct modsig *modsig) } #endif /* CONFIG_IMA_APPRAISE_MODSIG */ -/* LSM based policy rules require audit */ -#ifdef CONFIG_IMA_LSM_RULES - -#define ima_filter_rule_init security_audit_rule_init -#define ima_filter_rule_free security_audit_rule_free -#define ima_filter_rule_match security_audit_rule_match - -#else - -static inline int ima_filter_rule_init(u32 field, u32 op, char *rulestr, - void **lsmrule) -{ - return -EINVAL; -} - -static inline void ima_filter_rule_free(void *lsmrule) -{ -} - -static inline int ima_filter_rule_match(u32 secid, u32 field, u32 op, - void *lsmrule) -{ - return -EINVAL; -} -#endif /* CONFIG_IMA_LSM_RULES */ - #ifdef CONFIG_IMA_READ_POLICY #define POLICY_FILE_FLAGS (S_IWUSR | S_IRUSR) #else diff --git a/security/security.c b/security/security.c index c88167a414b4..063c9cbbcea6 100644 --- a/security/security.c +++ b/security/security.c @@ -2563,6 +2563,27 @@ int security_audit_rule_match(u32 secid, u32 field, u32 op, void *lsmrule) } #endif /* CONFIG_AUDIT */ +#ifdef CONFIG_IMA_LSM_RULES +/* + * The integrity subsystem uses the same hooks as + * the audit subsystem. + */ +int ima_filter_rule_init(u32 field, u32 op, char *rulestr, void **lsmrule) +{ + return call_int_hook(audit_rule_init, 0, field, op, rulestr, lsmrule); +} + +void ima_filter_rule_free(void *lsmrule) +{ + call_void_hook(audit_rule_free, lsmrule); +} + +int ima_filter_rule_match(u32 secid, u32 field, u32 op, void *lsmrule) +{ + return call_int_hook(audit_rule_match, 0, secid, field, op, lsmrule); +} +#endif /* CONFIG_IMA_LSM_RULES */ + #ifdef CONFIG_BPF_SYSCALL int security_bpf(int cmd, union bpf_attr *attr, unsigned int size) {