linux-next: manual merge of the pidfd tree with the integrity tree

linux-next: manual merge of the pidfd tree with the integrity tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the pidfd tree with the integrity tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2088 bytes --]

Hi all,

On Mon, 25 Jan 2021 17:18:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> 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.
> 
> 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);
>   }
>   
>   /*

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pidfd tree with the integrity tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2351 bytes --]

Hi all,

On Mon, 15 Feb 2021 08:07:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Mon, 25 Jan 2021 17:18:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > 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.
> > 
> > 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);
> >   }
> >   
> >   /*  
> 
> With the merge window about to open, this is a reminder that this
> conflict still exists.

This is now a conflict between the pidfd tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the pidfd tree with the integrity tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the pidfd tree got a conflict in:

  security/integrity/ima/ima_main.c

between commits:

  2b4a2474a202 ("IMA: generalize keyring specific measurement constructs")
  291af651b350 ("IMA: add support to measure buffer data hash")
  d6e645012d97 ("IMA: define a hook to measure kernel integrity critical data")
  9f5d7d23cc5e ("IMA: extend critical data hook to limit the measurement based on a label")

from the integrity tree and commit:

  a2d2329e30e2 ("ima: handle idmapped mounts")

from the pidfd tree.

At this point, the whole thing just got too hard, so I dropped the
pidfd tree for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]