Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Fri, 27 Oct 2023 16:34:00 +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: linux-next: build failure after merge of the landlock tree
Message-ID: <20231027163400.5764d549@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/m5HOWf6jM/D/e4rBXcr.b7H";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/m5HOWf6jM/D/e4rBXcr.b7H
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the landlock tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

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_ad=
d_hooks' from incompatible pointer type [-Werror=3Dincompatible-pointer-typ=
es]
   12 | #define LANDLOCK_NAME "landlock"
      |                       ^~~~~~~~~~
      |                       |
      |                       char *
security/landlock/net.c:199:28: note: in expansion of macro 'LANDLOCK_NAME'
  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 *' bu=
t argument is of type 'char *'
  120 |                                const struct lsm_id *lsmid);
      |                                ~~~~~~~~~~~~~~~~~~~~~^~~~~

Caused by commit

  fff69fb03dde ("landlock: Support network rules with TCP bind and connect")

interacting with commit

  9b09f11320db ("LSM: Identify modules by more than name")

from the security tree.

I have applied the following merge resolution patch.

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 a=
nd
 connect"

interacting with "LSM: Identify modules by more than name"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 security/landlock/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

--=20
Cheers,
Stephen Rothwell

--Sig_/m5HOWf6jM/D/e4rBXcr.b7H
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU7S8gACgkQAVBC80lX
0GxBlwf8CZN2qGCwBQDbwTx5IZjzE3VfGoAEWcFxeQzH7FdS5eBJBJjb8h+4exNd
YayxJxYQ8yN5WYjBWjN6A26xEEdmpFB1Y0Db3MqTeQSW44V0x+ZOwXsj+HRVHQJD
WwVKeosXLAFJ7y7CLjcbZm+KdsoYeH311XndVrQYd5kzodfscfHPYyQBOgEEIjcO
whDOvkFDOTgBtdJN5QIf6j5KpN1YBOxAvFnffA1WOOEpKSuE40Z7qZteDgsJiOQ8
x6830RrEcY3TGikbQJQYlbK5SkqP5geg+V3KXO8i6yU2Sr5a9CXTmcjOxrLPc3jC
MbXLGAWc4GWObmh6y1IdOrB021Rj0Q==
=74Wl
-----END PGP SIGNATURE-----

--Sig_/m5HOWf6jM/D/e4rBXcr.b7H--