Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 15 May 2023 21:10:19 +0200
From:   Joel Granados <j.granados@samsung.com>
To:     <mcgrof@kernel.org>
CC:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
        Iurii Zaikin <yzaikin@google.com>,
        Kees Cook <keescook@chromium.org>,
        <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 3/6] parport: Remove register_sysctl_table from
 parport_device_proc_register
Message-ID: <20230515191019.cggga6c7yhnjzj4a@localhost>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg="pgp-sha512";
        protocol="application/pgp-signature"; boundary="wytu3hi3jl3xaskq"
Content-Disposition: inline
In-Reply-To: <20230515071446.2277292-4-j.granados@samsung.com>
CMS-TYPE: 201P
References: <20230515071446.2277292-1-j.granados@samsung.com>
        <20230515071446.2277292-4-j.granados@samsung.com>
        <CGME20230515192630eucas1p2c9bf0ffa8ddc2d0bcf9a9818c6ecd6a8@eucas1p2.samsung.com>
Precedence: bulk

--wytu3hi3jl3xaskq
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, May 15, 2023 at 09:14:43AM +0200, Joel Granados wrote:
> This is part of the general push to deprecate register_sysctl_paths and
> register_sysctl_table. We use a temp allocation to include both port and
> device name in proc. Allocated mem is freed at the end. The unused
> parport_device_sysctl_template struct elements that are not used are
> removed.
>=20
> Signed-off-by: Joel Granados <j.granados@samsung.com>
> ---
>  drivers/parport/procfs.c | 57 +++++++++++++++++++++++-----------------
>  1 file changed, 33 insertions(+), 24 deletions(-)
>=20
> diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
> index 53ae5cb98190..902547eb045c 100644
> --- a/drivers/parport/procfs.c
> +++ b/drivers/parport/procfs.c
> @@ -384,6 +384,7 @@ parport_device_sysctl_template =3D {
>  			.extra1		=3D (void*) &parport_min_timeslice_value,
>  			.extra2		=3D (void*) &parport_max_timeslice_value
>  		},
> +		{}
>  	},
>  	{
>  		{
> @@ -394,22 +395,6 @@ parport_device_sysctl_template =3D {
>  			.child		=3D NULL
>  		},
>  		{}
> -	},
> -	{
> -		PARPORT_DEVICES_ROOT_DIR,
> -		{}
> -	},
> -	{
> -		PARPORT_PORT_DIR(NULL),
> -		{}
> -	},
> -	{
> -		PARPORT_PARPORT_DIR(NULL),
> -		{}
> -	},
> -	{
> -		PARPORT_DEV_DIR(NULL),
> -		{}
>  	}
>  };
> =20
> @@ -547,30 +532,54 @@ int parport_proc_unregister(struct parport *port)
> =20
>  int parport_device_proc_register(struct pardevice *device)
>  {
> +	int err =3D 0;
>  	struct parport_device_sysctl_table *t;
>  	struct parport * port =3D device->port;
> +	size_t port_name_len, device_name_len, tmp_dir_path_len;
> +	char *tmp_dir_path;
>  =09
>  	t =3D kmemdup(&parport_device_sysctl_template, sizeof(*t), GFP_KERNEL);
>  	if (t =3D=3D NULL)
>  		return -ENOMEM;
> =20
> -	t->dev_dir[0].child =3D t->parport_dir;
> -	t->parport_dir[0].child =3D t->port_dir;
> -	t->port_dir[0].procname =3D port->name;
> -	t->port_dir[0].child =3D t->devices_root_dir;
> -	t->devices_root_dir[0].child =3D t->device_dir;
> +	port_name_len =3D strnlen(port->name, PARPORT_NAME_MAX_LEN);
> +	device_name_len =3D strnlen(device->name, PATH_MAX);
> +
> +	/* Allocate a buffer for two paths: dev/parport/PORT/devices/DEVICE. */
> +	tmp_dir_path_len =3D PARPORT_BASE_DEVICES_PATH_SIZE + port_name_len + d=
evice_name_len;
> +	tmp_dir_path =3D kmalloc(tmp_dir_path_len, GFP_KERNEL);
> +	if (!tmp_dir_path) {
> +		err =3D -ENOMEM;
> +		goto exit_free_t;
> +	}
> +
> +	if (tmp_dir_path_len
> +	    <=3D snprintf(tmp_dir_path, tmp_dir_path_len, "dev/parport/%s/devic=
es/%s",
> +			port->name, device->name)) {
> +		err =3D -ENOENT;
> +		goto exit_free_path;
> +	}
> =20
> -	t->device_dir[0].procname =3D device->name;
> -	t->device_dir[0].child =3D t->vars;
>  	t->vars[0].data =3D &device->timeslice;
> =20
> -	t->sysctl_header =3D register_sysctl_table(t->dev_dir);
> +	t->sysctl_header =3D register_sysctl(tmp_dir_path, t->vars);
>  	if (t->sysctl_header =3D=3D NULL) {
>  		kfree(t);
>  		t =3D NULL;
In the paprport_proc_register there is the same logic where we do not
return error code on error. Additionally, noone checks the return values
of parport_proc_register nor parport_device_proc_register. Should we
just change these to void and be done with it? Or is it better to change
parport/share.c to take care of the error codes?

I realized this after some comments from 0-day.

Best


>  	}
>  	device->sysctl_table =3D t;
> +
> +	kfree(tmp_dir_path);
>  	return 0;
> +
> +exit_free_path:
> +	kfree(tmp_dir_path);
> +
> +exit_free_t:
> +	kfree(t);
> +	t =3D NULL;
> +
> +	return err;
>  }
> =20
>  int parport_device_proc_unregister(struct pardevice *device)
> --=20
> 2.30.2
>=20

--=20

Joel Granados

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

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

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmRig4wACgkQupfNUreW
QU+5qAv/XUSUpZ7GDIyi+UcJXFhuAnY7M/KsHwYQTxZVoFVqp/KB2Xi26TYWbXSZ
MHGPBo0gfFm3wxXNqUoY8hGBRHOUJ33o6yzNYj4rs8WP1ncaySX7fk+9pAD1s+SN
QqETROf1xU0wiFZHOM75/aazrMFFjPLl7iiT0Jz/g7qE8MsnBqYB/2cp848jMgqw
8P7c30PP3YldPeWSgBISG9fQpfRkYrJzdnMg9NHpFFdLS8cHRXS8hhmXnoCozt6L
NkBj+jZ8B+v49XFrbu0Sdkdn4y4OFxJ3ca6OUlz1nM+cvzX5Z5xuPBiG4s5C92u9
ZFdLd7gkrz4kVmiSZ4bPlwHUBElNTvGAHzuXmDcUvVJm9DnbUUYq7eu6sHqFlBtn
mY2o6Nilem4m+dvdU+ukg+dzEGEzc0GS5FAomhWz1snpTKGe7cavN2ItZvfUjaq4
z2pw10ojjpeyVAjUGvb/UjPmLdG5LI8tIM1aUuF9Xvip1VxsfZ2y8ovEHwnXxe2d
dtBBkUUz
=1gYL
-----END PGP SIGNATURE-----

--wytu3hi3jl3xaskq--