Received-SPF: pass (google.com: domain of linux-kernel+bounces-148378-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 17 Apr 2024 11:44:33 +0200
From: Joel Granados <j.granados@samsung.com>
To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= <linux@weissschuh.net>
CC: "David S. Miller" <davem@davemloft.net>, Eric Dumazet
	<edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni
	<pabeni@redhat.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, "Eric W.
 Biederman" <ebiederm@xmission.com>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, Luis Chamberlain <mcgrof@kernel.org>,
	Kuniyuki Iwashima <kuniyu@amazon.com>, <stable@vger.kernel.org>
Subject: Re: [PATCH v3] fs/proc/proc_sysctl.c: always initialize i_uid/i_gid
Message-ID: <20240417094433.ahfnijzz2svjhrvt@joelS2.panther.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg="pgp-sha512";
	protocol="application/pgp-signature"; boundary="yvgo774vb4mne4gd"
Content-Disposition: inline
In-Reply-To: <20240402-sysctl-net-ownership-v3-1-366b1a76d48a@weissschuh.net>
CMS-TYPE: 201P
References: <CGME20240402211043eucas1p173a936d187ae9bcf5be3729e69739e38@eucas1p1.samsung.com>
	<20240402-sysctl-net-ownership-v3-1-366b1a76d48a@weissschuh.net>

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

On Tue, Apr 02, 2024 at 11:10:34PM +0200, Thomas Wei=DFschuh wrote:
> Commit 5ec27ec735ba ("fs/proc/proc_sysctl.c: fix the default values of i_=
uid/i_gid on /proc/sys inodes.")
> added defaults for i_uid/i_gid when set_ownership() is not implemented.
> It missed to also adjust net_ctl_set_ownership() to use the same default
> values in case the computation of a better value fails.
>=20
> Instead always initialize i_uid/i_gid inside the sysfs core so
> set_ownership() can safely skip setting them.

Added this to sysctl-testing with minor changes in the commit message:

"""
sysctl: always initialize i_uid/i_gid

Always initialize i_uid/i_gid inside the sysfs core so set_ownership()
can safely skip setting them.

Commit 5ec27ec735ba ("fs/proc/proc_sysctl.c: fix the default values of
i_uid/i_gid on /proc/sys inodes.") added defaults for i_uid/i_gid when
set_ownership() was not implemented. It also missed adjusting
net_ctl_set_ownership() to use the same default values in case the
computation of a better value failed.

Fixes: 5ec27ec735ba ("fs/proc/proc_sysctl.c: fix the default values of i_ui=
d/i_gid on /proc/sys inodes.")
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
Signed-off-by: Joel Granados <j.granados@samsung.com>
"""

Will let it simmer in testing for now.

Best

>=20
> Fixes: 5ec27ec735ba ("fs/proc/proc_sysctl.c: fix the default values of i_=
uid/i_gid on /proc/sys inodes.")
> Cc: stable@vger.kernel.org
> Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
> ---
> Changes in v3:
> - Rebase onto v6.9-rc1
> - Reword commit message and mention correct fixed commit
> - Link to v2: https://lore.kernel.org/r/20240322-sysctl-net-ownership-v2-=
1-a8b4a3306542@weissschuh.net
>=20
> Changes in v2:
> - Move the fallback logic to the sysctl core
> - Link to v1: https://lore.kernel.org/r/20240315-sysctl-net-ownership-v1-=
1-2b465555a292@weissschuh.net
> ---
>  fs/proc/proc_sysctl.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>=20
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 37cde0efee57..9e34ab9c21e4 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -479,12 +479,10 @@ static struct inode *proc_sys_make_inode(struct sup=
er_block *sb,
>  			make_empty_dir_inode(inode);
>  	}
> =20
> +	inode->i_uid =3D GLOBAL_ROOT_UID;
> +	inode->i_gid =3D GLOBAL_ROOT_GID;
>  	if (root->set_ownership)
>  		root->set_ownership(head, table, &inode->i_uid, &inode->i_gid);
> -	else {
> -		inode->i_uid =3D GLOBAL_ROOT_UID;
> -		inode->i_gid =3D GLOBAL_ROOT_GID;
> -	}
> =20
>  	return inode;
>  }
>=20
> ---
> base-commit: 4cece764965020c22cff7665b18a012006359095
> change-id: 20240315-sysctl-net-ownership-bc4e17eaeea6
>=20
> Best regards,
> --=20
> Thomas Wei=DFschuh <linux@weissschuh.net>
>=20

--=20

Joel Granados

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

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

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmYfmgAACgkQupfNUreW
QU9U/Av9HKXJffWcIsZrwOT7yI37cd8cc4W1cjH3yBMzvQ9RWE6365mNygSJp0hs
eGO+pFN+UtxaJmkPKG8MPVuggE+fmrvU++Ld4s/W9H55mNRALAu7q/KPPSgNXcb6
wjfhKLcCteSVTMW/jU8LWWevH/35Y6Uf1eVWoNbzuQbxKsDTy52JzmRzSo2AC/8R
1L10XsolcGe90NlnRlM7BHYvh02ZPrgjjZBCzYcxy8XhjqNZZsrRRmWLTwnGb80+
gPjx6gRO3QYnQu0+jmfvu8C85dJKG9hV0oR9xSV0tqVITre0dpsjhgYKWz/mGIUN
m/oOSDIiJhYFzUcSxcv4B/sNEnxltWMrgNYv7+lpUTekxFRKxlO7vwHVp/2SVJFO
NoGTC//FKOPASWRRzKpCdlulMDEndfHgsYHksFxQs/90sBfGhCYGKDjZ1sCQ5Xoc
ytuR3cgJd/01e9R235dLfq5+JXN0ORzJefcwS88B7365Yah0PY6IxR81kMhM/gCL
niVLSZ0W
=WR4U
-----END PGP SIGNATURE-----

--yvgo774vb4mne4gd--