On Wed, Aug 31, 2022 at 10:27 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the security tree got a conflict in:
>
> security/selinux/include/classmap.h
>
> between commit:
>
> f4d653dcaa4e ("selinux: implement the security_uring_cmd() LSM hook")
>
> from Linus' tree and commit:
>
> ed5d44d42c95 ("selinux: Implement userns_create hook")
>
> from the security 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/selinux/include/classmap.h
> index 1c2f41ff4e55,0bff55bb9cde..000000000000
> --- a/security/selinux/include/classmap.h
> +++ b/security/selinux/include/classmap.h
> @@@ -253,7 -253,9 +253,9 @@@ const struct security_class_mapping sec
> { "anon_inode",
> { COMMON_FILE_PERMS, NULL } },
> { "io_uring",
> - { "override_creds", "sqpoll", NULL } },
> + { "override_creds", "sqpoll", "cmd", NULL } },
> + { "user_namespace",
> + { "create", NULL } },
> { NULL }
> };
Thanks Stephen, that looks correct.
--
paul-moore.com
