From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mimi Zohar <zohar@linux•vnet.ibm.com>, Jeff Layton <jlayton@kernel•org>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sascha Hauer <s.hauer@pengutronix•de>
Subject: linux-next: manual merge of the integrity tree with the iversion tree
Date: Tue, 2 Jan 2018 13:41:16 +1100 [thread overview]
Message-ID: <20180102134116.0187e064@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the integrity tree got a conflict in:
security/integrity/ima/ima_main.c
between commits:
ac0bf025d2c0 ("ima: Use i_version only when filesystem supports it")
57fe39d33423 ("IMA: switch IMA over to new i_version API")
from the iversion tree and commit:
0d73a55208e9 ("ima: re-introduce own integrity cache lock")
a2a2c3c8580a ("ima: Use i_version only when filesystem supports it")
from the integrity tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc security/integrity/ima/ima_main.c
index 06a70c5a2329,6d78cb26784d..000000000000
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@@ -126,10 -129,12 +130,12 @@@ static void ima_check_last_writer(struc
if (!(mode & FMODE_WRITE))
return;
- inode_lock(inode);
+ mutex_lock(&iint->mutex);
if (atomic_read(&inode->i_writecount) == 1) {
+ update = test_and_clear_bit(IMA_UPDATE_XATTR,
+ &iint->atomic_flags);
if (!IS_I_VERSION(inode) ||
- (iint->version != inode->i_version) ||
+ inode_cmp_iversion(inode, iint->version) ||
(iint->flags & IMA_NEW_FILE)) {
iint->flags &= ~(IMA_DONE_MASK | IMA_NEW_FILE);
iint->measured_pcrs = 0;
reply other threads:[~2018-01-02 2:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180102134116.0187e064@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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