Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'lsm-pr-20241129' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
Pull ima fix from Paul Moore:
"One small patch to fix a function parameter / local variable naming
snafu that went up to you in the current merge window"
* tag 'lsm-pr-20241129' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
ima: uncover hidden variable in ima_match_rules()
+5
-4
+5
-4
security/integrity/ima/ima_policy.c
+5
-4
security/integrity/ima/ima_policy.c
···
635
635
return false;
636
636
for (i = 0; i < MAX_LSM_RULES; i++) {
637
637
int rc = 0;
638
-
struct lsm_prop prop = { };
638
+
struct lsm_prop inode_prop = { };
639
639
640
640
if (!lsm_rule->lsm[i].rule) {
641
641
if (!lsm_rule->lsm[i].args_p)
···
649
649
case LSM_OBJ_USER:
650
650
case LSM_OBJ_ROLE:
651
651
case LSM_OBJ_TYPE:
652
-
security_inode_getlsmprop(inode, &prop);
653
-
rc = ima_filter_rule_match(&prop, lsm_rule->lsm[i].type,
652
+
security_inode_getlsmprop(inode, &inode_prop);
653
+
rc = ima_filter_rule_match(&inode_prop,
654
+
lsm_rule->lsm[i].type,
654
655
Audit_equal,
655
656
lsm_rule->lsm[i].rule);
656
657
break;
657
658
case LSM_SUBJ_USER:
658
659
case LSM_SUBJ_ROLE:
659
660
case LSM_SUBJ_TYPE:
660
-
rc = ima_filter_rule_match(&prop, lsm_rule->lsm[i].type,
661
+
rc = ima_filter_rule_match(prop, lsm_rule->lsm[i].type,
661
662
Audit_equal,
662
663
lsm_rule->lsm[i].rule);
663
664
break;