On Mon, Feb 10, 2020 at 07:07:50PM +0100, Ahmad Fatoum wrote:
> Currently, we expect each driver to have a name. If a driver doesn't,
> we run into a NULL pointer dereference. Make this error scenario more
> pleasant by checking if a name is set and failing otherwise.
>
> The only in-tree driver affected by this is drivers/watchdog/dw_wdt.c,
> which will be fixed in the follow-up commit.
>
> Affected drivers can be determined with following pipeline, which should
> return all driver_d structure instantiations that don't contain a name:
>
> ack --A 4 'struct driver_d.*' | perl -pe 's/^--$/\n/' | \
> perl -000 -ne 'print if /=.*\{.*\}/s && !/name/s'
>
> With this change, these drivers should now give a more pleasant message:
>
> ERROR: initcall dw_wdt_driver_register+0x1/0xc failed: Invalid argument
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> drivers/base/driver.c | 3 +++
> 1 file changed, 3 insertions(+)
Applied, thanks
Sascha
>
> diff --git a/drivers/base/driver.c b/drivers/base/driver.c
> index eec2a2d8a2a5..116ccb25864b 100644
> --- a/drivers/base/driver.c
> +++ b/drivers/base/driver.c
> @@ -308,6 +308,9 @@ int register_driver(struct driver_d *drv)
> {
> struct device_d *dev = NULL;
>
> + if (!drv->name)
> + return -EINVAL;
> +
> debug("register_driver: %s\n", drv->name);
>
> BUG_ON(!drv->bus);
> --
> 2.25.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
