Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Date:   Mon, 6 Nov 2023 10:22:09 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     =?UTF-8?B?TWlja2HDq2wgU2FsYcO8bg==?= <mic@digikod.net>,
        Paul Moore <paul@paul-moore.com>
Cc:     Casey Schaufler <casey@schaufler-ca.com>,
        Kees Cook <keescook@chromium.org>,
        Konstantin Meskhidze <konstantin.meskhidze@huawei.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the landlock tree
Message-ID: <20231106102209.4b07d7e7@canb.auug.org.au>
In-Reply-To: <20231027163400.5764d549@canb.auug.org.au>
References: <20231027163400.5764d549@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/L4WbjisVULi66lxp_lEZC4x";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/L4WbjisVULi66lxp_lEZC4x
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 27 Oct 2023 16:34:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the landlock tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>=20
> In file included from security/landlock/net.c:14:
> security/landlock/net.c: In function 'landlock_add_net_hooks':
> security/landlock/common.h:12:23: error: passing argument 3 of 'security_=
add_hooks' from incompatible pointer type [-Werror=3Dincompatible-pointer-t=
ypes]
>    12 | #define LANDLOCK_NAME "landlock"
>       |                       ^~~~~~~~~~
>       |                       |
>       |                       char *
> security/landlock/net.c:199:28: note: in expansion of macro 'LANDLOCK_NAM=
E'
>   199 |                            LANDLOCK_NAME);
>       |                            ^~~~~~~~~~~~~
> In file included from security/landlock/setup.h:12,
>                  from security/landlock/cred.h:17,
>                  from security/landlock/net.c:15:
> include/linux/lsm_hooks.h:120:53: note: expected 'const struct lsm_id *' =
but argument is of type 'char *'
>   120 |                                const struct lsm_id *lsmid);
>       |                                ~~~~~~~~~~~~~~~~~~~~~^~~~~
>=20
> Caused by commit
>=20
>   fff69fb03dde ("landlock: Support network rules with TCP bind and connec=
t")
>=20
> interacting with commit
>=20
>   9b09f11320db ("LSM: Identify modules by more than name")
>=20
> from the security tree.
>=20
> I have applied the following merge resolution patch.
>=20
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 27 Oct 2023 16:13:32 +1100
> Subject: [PATCH] fixup for "landlock: Support network rules with TCP bind=
 and
>  connect"
>=20
> interacting with "LSM: Identify modules by more than name"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  security/landlock/net.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/security/landlock/net.c b/security/landlock/net.c
> index aaa92c2b1f08..efa1b644a4af 100644
> --- a/security/landlock/net.c
> +++ b/security/landlock/net.c
> @@ -196,5 +196,5 @@ static struct security_hook_list landlock_hooks[] __r=
o_after_init =3D {
>  __init void landlock_add_net_hooks(void)
>  {
>  	security_add_hooks(landlock_hooks, ARRAY_SIZE(landlock_hooks),
> -			   LANDLOCK_NAME);
> +			   &landlock_lsmid);
>  }
> --=20
> 2.40.1

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

--Sig_/L4WbjisVULi66lxp_lEZC4x
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVII6EACgkQAVBC80lX
0GxX6gf/Traap0Ho5WqkzDsT4PKC5irgj6MhkN1wWCxfABSHc8sqOlRNKIMD1Jpj
3pk2irkl86l5AL9pUwmtSMPUZkSjhYMM7X87Bj8QCDy6mIa8xiQ1ExQ+WFzA9s9K
O9Y3WM7OB2vGonkFV/MRAk5RIbOogSI88s8ygomu2rw6n4BEJJvr7qtsQIoS+mhD
bmtxz3j3UhpZrjjciNJw9+76IAEVnyw0PrwgftAZjCHg5OkwtlsFY7CNschjprG3
7erw3YZPR3X6tPsfRbs9FveAWrCBpTa6SDubFuRppkzQFEmHVcpDGX7AzKe5xL4y
cUXj7Qt/4/GVrOvg2ZP/B8hxFiDY6Q==
=0F30
-----END PGP SIGNATURE-----

--Sig_/L4WbjisVULi66lxp_lEZC4x--