From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, zohar@linux.ibm.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr
Date: Thu, 6 Mar 2025 14:11:20 -0500 [thread overview]
Message-ID: <20250306112709-ece888969576e60b@stable.kernel.org> (raw)
In-Reply-To: <20250306022833.6151-1-zohar@linux.ibm.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 57a0ef02fefafc4b9603e33a18b669ba5ce59ba3
WARNING: Author mismatch between patch and found commit:
Backport author: Mimi Zohar<zohar@linux.ibm.com>
Commit author: Roberto Sassu<roberto.sassu@huawei.com>
Note: The patch differs from the upstream commit:
---
1: 57a0ef02fefaf ! 1: 6f8f39f341145 ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr
@@ Commit message
Fixes: 0d73a55208e9 ("ima: re-introduce own integrity cache lock")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
-
- ## security/integrity/ima/ima.h ##
-@@ security/integrity/ima/ima.h: struct ima_kexec_hdr {
- #define IMA_CHECK_BLACKLIST 0x40000000
- #define IMA_VERITY_REQUIRED 0x80000000
-
-+/* Exclude non-action flags which are not rule-specific. */
-+#define IMA_NONACTION_RULE_FLAGS (IMA_NONACTION_FLAGS & ~IMA_NEW_FILE)
-+
- #define IMA_DO_MASK (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT | \
- IMA_HASH | IMA_APPRAISE_SUBMASK)
- #define IMA_DONE_MASK (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED | \
+ (cherry picked from commit 57a0ef02fefafc4b9603e33a18b669ba5ce59ba3)
## security/integrity/ima/ima_main.c ##
@@ security/integrity/ima/ima_main.c: static int process_measurement(struct file *file, const struct cred *cred,
@@ security/integrity/ima/ima_main.c: static int process_measurement(struct file *f
/*
* Re-evaulate the file if either the xattr has changed or the
+
+ ## security/integrity/integrity.h ##
+@@
+ #define IMA_CHECK_BLACKLIST 0x40000000
+ #define IMA_VERITY_REQUIRED 0x80000000
+
++/* Exclude non-action flags which are not rule-specific. */
++#define IMA_NONACTION_RULE_FLAGS (IMA_NONACTION_FLAGS & ~IMA_NEW_FILE)
++
+ #define IMA_DO_MASK (IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT | \
+ IMA_HASH | IMA_APPRAISE_SUBMASK)
+ #define IMA_DONE_MASK (IMA_MEASURED | IMA_APPRAISED | IMA_AUDITED | \
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
prev parent reply other threads:[~2025-03-06 19:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-04 16:42 FAILED: patch "[PATCH] ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr" failed to apply to 6.6-stable tree gregkh
2025-03-06 2:28 ` [PATCH 6.6.y] ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr Mimi Zohar
2025-03-06 19:11 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250306112709-ece888969576e60b@stable.kernel.org \
--to=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox