Received-SPF: pass (google.com: domain of linux-kernel+bounces-111423-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Fri, 22 Mar 2024 13:32:46 +0100
From: Joel Granados <j.granados@samsung.com>
To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= <linux@weissschuh.net>
CC: Luis Chamberlain <mcgrof@kernel.org>, Kees Cook <keescook@chromium.org>,
	"David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	<linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
	<netdev@vger.kernel.org>
Subject: Re: [PATCH v3 2/2] sysctl: treewide: constify argument
 ctl_table_root::permissions(table)
Message-ID: <20240322123246.bxxgiiwb3hjbmvb2@joelS2.panther.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg="pgp-sha512";
	protocol="application/pgp-signature"; boundary="6v6kdadjlfixw7rp"
Content-Disposition: inline
In-Reply-To: <20240315-sysctl-const-ownership-v3-2-b86680eae02e@weissschuh.net>
CMS-TYPE: 201P
References: <20240315-sysctl-const-ownership-v3-0-b86680eae02e@weissschuh.net>
	<CGME20240315181140eucas1p229d306ff1d983bb302d24631e4381c5e@eucas1p2.samsung.com>
	<20240315-sysctl-const-ownership-v3-2-b86680eae02e@weissschuh.net>

--6v6kdadjlfixw7rp
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Mar 15, 2024 at 07:11:31PM +0100, Thomas Wei=DFschuh wrote:
> The permissions callback is not supposed to modify the ctl_table.
> Enforce this expectation via the typesystem.
>=20
> The patch was created with the following coccinelle script:
>=20
>   @@
>   identifier func, head, ctl;
>   @@
>=20
>   int func(
>     struct ctl_table_header *head,
>   - struct ctl_table *ctl)
>   + const struct ctl_table *ctl)
>   { ... }
>=20
> (insert_entry() from fs/proc/proc_sysctl.c is a false-positive)
>=20
> The three changed locations were validated through manually inspection
> and compilation.
Will remove this when I add it to constfy branch as it is unclear (for
me) what "manually inspection" is and also I do not know what config you
used to compile. IMO, we can just do without it.

>=20
> In addition a search for '.permissions =3D' was done over the full tree to
> look for places that were missed by coccinelle.
> None were found.
>=20
> This change also is a step to put "struct ctl_table" into .rodata
> throughout the kernel.

This LGTM. Will add this to the constfy testing branch with these
changes in the commit message:
"""
sysctl: treewide: constify argument ctl_table_root::permissions(table)

The permissions callback should not modify the ctl_table. Enforce this
expectation via the typesystem. This is a step to put "struct ctl_table"
into .rodata throughout the kernel.

The patch was created with the following coccinelle script:

  @@
  identifier func, head, ctl;
  @@

  int func(
    struct ctl_table_header *head,
  - struct ctl_table *ctl)
  + const struct ctl_table *ctl)
  { ... }

(insert_entry() from fs/proc/proc_sysctl.c is a false-positive)

No additional occurances of '.permissions =3D' were found after a
tree-wide search for places missed by the conccinelle script.

"""

Reviewed-by: Joel Granados <j.granados@samsung.com>
>=20
> Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
> ---
>  include/linux/sysctl.h | 2 +-
>  ipc/ipc_sysctl.c       | 2 +-
>  ipc/mq_sysctl.c        | 2 +-
>  kernel/ucount.c        | 2 +-
>  net/sysctl_net.c       | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
> index 60333a6b9370..f9214de0490c 100644
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -206,7 +206,7 @@ struct ctl_table_root {
>  	struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
>  	void (*set_ownership)(struct ctl_table_header *head,
>  			      kuid_t *uid, kgid_t *gid);
> -	int (*permissions)(struct ctl_table_header *head, struct ctl_table *tab=
le);
> +	int (*permissions)(struct ctl_table_header *head, const struct ctl_tabl=
e *table);
>  };
> =20
>  #define register_sysctl(path, table)	\
> diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
> index 1a5085e5b178..19b2a67aef40 100644
> --- a/ipc/ipc_sysctl.c
> +++ b/ipc/ipc_sysctl.c
> @@ -204,7 +204,7 @@ static void ipc_set_ownership(struct ctl_table_header=
 *head,
>  	*gid =3D gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
>  }
> =20
> -static int ipc_permissions(struct ctl_table_header *head, struct ctl_tab=
le *table)
> +static int ipc_permissions(struct ctl_table_header *head, const struct c=
tl_table *table)
>  {
>  	int mode =3D table->mode;
> =20
> diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
> index 6bb1c5397c69..43c0825da9e8 100644
> --- a/ipc/mq_sysctl.c
> +++ b/ipc/mq_sysctl.c
> @@ -90,7 +90,7 @@ static void mq_set_ownership(struct ctl_table_header *h=
ead,
>  	*gid =3D gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
>  }
> =20
> -static int mq_permissions(struct ctl_table_header *head, struct ctl_tabl=
e *table)
> +static int mq_permissions(struct ctl_table_header *head, const struct ct=
l_table *table)
>  {
>  	int mode =3D table->mode;
>  	kuid_t ns_root_uid;
> diff --git a/kernel/ucount.c b/kernel/ucount.c
> index 4aa6166cb856..90300840256b 100644
> --- a/kernel/ucount.c
> +++ b/kernel/ucount.c
> @@ -38,7 +38,7 @@ static int set_is_seen(struct ctl_table_set *set)
>  }
> =20
>  static int set_permissions(struct ctl_table_header *head,
> -				  struct ctl_table *table)
> +			   const struct ctl_table *table)
>  {
>  	struct user_namespace *user_ns =3D
>  		container_of(head->set, struct user_namespace, set);
> diff --git a/net/sysctl_net.c b/net/sysctl_net.c
> index a0a7a79991f9..f5017012a049 100644
> --- a/net/sysctl_net.c
> +++ b/net/sysctl_net.c
> @@ -40,7 +40,7 @@ static int is_seen(struct ctl_table_set *set)
> =20
>  /* Return standard mode bits for table entry. */
>  static int net_ctl_permissions(struct ctl_table_header *head,
> -			       struct ctl_table *table)
> +			       const struct ctl_table *table)
>  {
>  	struct net *net =3D container_of(head->set, struct net, sysctls);
> =20
>=20
> --=20
> 2.44.0
>=20

--=20

Joel Granados

--6v6kdadjlfixw7rp
Content-Type: application/pgp-signature; name="signature.asc"

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

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmX9em0ACgkQupfNUreW
QU+JRQv/R0MDqGXzC3NYKMv+wIm47Ltk3eMtQmkY12yK0OcF47dm6WzpobwWXL+f
4n5LwquGatNednUTNHw8HOhGxtfHvqJo34aNgfGKQXF9wsKVBVPNUrCA9R1exdb6
+M9Q0NrLC2cOMR19BxLjQPH2AABzcHzR3Q48d6vtFbAw3URWGPO387tmQFbvr3g4
26dmdaTKhmtzBRLWTdQp6sqQhDt1b2GCr1CL9bvlUTEJf7b7FD6F7/t29Of5O3YZ
8XJbhlzGvh8kcvAdGokSURjInmZjp2aSpeyCJjY7e6VqghFTi975qc5Tnf286Nw8
iZBavNVO21hioGmYu/7ZvlZIv2/zuPKKCQpmqZPu6E2XR9AtNzFT3NODvhYV1Gsh
/QvkKYFRHsMWIPtmaXBRG29Br/BDQkZG43OoT6KATZ9piTP8G50OrbWNLZZmouy+
P/sRR2UXvnOHTYUXX4pFUnV7LUDbUJU2aIsY0Bsr0ChyS+pUEQwo4NUCEYptJKXM
aGTz0BJL
=QTWi
-----END PGP SIGNATURE-----

--6v6kdadjlfixw7rp--