diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-18 03:35:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-18 03:35:12 +0200 |
| commit | 3d54351c64e8f9794e8838196036a2de3d752fce (patch) | |
| tree | b62d5234af0360ab82899441df2026fc97551488 /kernel | |
| parent | Revert "mm: mmap: allow for the maximum number of bits for randomizing mmap_b... (diff) | |
| parent | ima: Avoid blocking in RCU read-side critical section (diff) | |
| download | linux-3d54351c64e8f9794e8838196036a2de3d752fce.tar.xz linux-3d54351c64e8f9794e8838196036a2de3d752fce.zip | |
Merge tag 'lsm-pr-20240617' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
Pull lsm fix from Paul Moore:
"A single LSM/IMA patch to fix a problem caused by sleeping while in a
RCU critical section"
* tag 'lsm-pr-20240617' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
ima: Avoid blocking in RCU read-side critical section
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditfilter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index be8c680121e4..d6ef4f4f9cba 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -529,7 +529,8 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, entry->rule.buflen += f_val; f->lsm_str = str; err = security_audit_rule_init(f->type, f->op, str, - (void **)&f->lsm_rule); + (void **)&f->lsm_rule, + GFP_KERNEL); /* Keep currently invalid fields around in case they * become valid after a policy reload. */ if (err == -EINVAL) { @@ -799,7 +800,7 @@ static inline int audit_dupe_lsm_field(struct audit_field *df, /* our own (refreshed) copy of lsm_rule */ ret = security_audit_rule_init(df->type, df->op, df->lsm_str, - (void **)&df->lsm_rule); + (void **)&df->lsm_rule, GFP_KERNEL); /* Keep currently invalid fields around in case they * become valid after a policy reload. */ if (ret == -EINVAL) { |