From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>,
Mimi Zohar <zohar@linux•vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail•com>
Cc: Christian Brauner <christian.brauner@ubuntu•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mimi Zohar <zohar@linux•ibm.com>,
Tushar Sugandhi <tusharsu@linux•microsoft.com>
Subject: linux-next: manual merge of the pidfd tree with the integrity tree
Date: Mon, 25 Jan 2021 17:18:18 +1100 [thread overview]
Message-ID: <20210125171818.286f08b9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1808 bytes --]
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
security/integrity/ima/ima_api.c
between commit:
2b4a2474a202 ("IMA: generalize keyring specific measurement constructs")
from the integrity tree and commit:
a2d2329e30e2 ("ima: handle idmapped mounts")
from the pidfd 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_api.c
index 1dd70dc68ffd,ed410efb3597..000000000000
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@@ -183,17 -184,18 +184,18 @@@ err_out
* Returns IMA_MEASURE, IMA_APPRAISE mask.
*
*/
- int ima_get_action(struct inode *inode, const struct cred *cred, u32 secid,
- int mask, enum ima_hooks func, int *pcr,
+ int ima_get_action(struct user_namespace *mnt_userns, struct inode *inode,
+ const struct cred *cred, u32 secid, int mask,
+ enum ima_hooks func, int *pcr,
struct ima_template_desc **template_desc,
- const char *keyring)
+ const char *func_data)
{
int flags = IMA_MEASURE | IMA_AUDIT | IMA_APPRAISE | IMA_HASH;
flags &= ima_policy_flag;
- return ima_match_policy(inode, cred, secid, func, mask, flags, pcr,
- template_desc, func_data);
+ return ima_match_policy(mnt_userns, inode, cred, secid, func, mask,
- flags, pcr, template_desc, keyring);
++ flags, pcr, template_desc, func_data);
}
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-01-25 6:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 6:18 Stephen Rothwell [this message]
2021-02-14 21:07 ` linux-next: manual merge of the pidfd tree with the integrity tree Stephen Rothwell
2021-02-23 0:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 6:31 Stephen Rothwell
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=20210125171818.286f08b9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tusharsu@linux$(echo .)microsoft.com \
--cc=zohar@linux$(echo .)ibm.com \
--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