linux-kernel - Re: [PATCH next] driver core: auxiliary bus: Fix IS_ERR() vs NULL check in __devm_auxiliary_device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1jzfg7nrzn.fsf@starbuckisacylon.baylibre.com>
Date: Wed, 23 Apr 2025 11:31:56 +0200
From: Jerome Brunet <jbrunet@...libre.com>
To: Dan Carpenter <dan.carpenter@...aro.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,  Dave Ertman
 <david.m.ertman@...el.com>,  Ira Weiny <ira.weiny@...el.com>,  Leon
 Romanovsky <leon@...nel.org>,  "Rafael J. Wysocki" <rafael@...nel.org>,
  Danilo Krummrich <dakr@...nel.org>,  linux-kernel@...r.kernel.org,
  kernel-janitors@...r.kernel.org
Subject: Re: [PATCH next] driver core: auxiliary bus: Fix IS_ERR() vs NULL
 check in __devm_auxiliary_device_create()

On Wed 23 Apr 2025 at 11:17, Dan Carpenter <dan.carpenter@...aro.org> wrote:

> The auxiliary_device_create() function returns NULL.  It doesn't return
> error pointers.  Update the checking to match.
>
> Fixes: eaa0d30216c1 ("driver core: auxiliary bus: add device creation helpers")
> Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>

Thanks for catching this mistake Dan.

The thing was initially setup to return error code. Greg asked to
simply return NULL on error and I forgot to re-align the devm variant.

So I think the fix should be to check for NULL as you did but return
NULL too so it is aligned with non-devm variant.

If you wish, I can handle a v2.

> ---
>  drivers/base/auxiliary.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
> index 810b6105a75d..61b876d90b7f 100644
> --- a/drivers/base/auxiliary.c
> +++ b/drivers/base/auxiliary.c
> @@ -491,8 +491,8 @@ struct auxiliary_device *__devm_auxiliary_device_create(struct device *dev,
>  	int ret;
>  
>  	auxdev = auxiliary_device_create(dev, modname, devname, platform_data, id);
> -	if (IS_ERR(auxdev))
> -		return auxdev;
> +	if (!auxdev)
> +		return ERR_PTR(-ENOMEM);
>  
>  	ret = devm_add_action_or_reset(dev, auxiliary_device_destroy,
>  				       auxdev);

-- 
Jerome