linux-kernel - Re: [PATCH] usb: hub: Simplify error and success path in port_over_current

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: <YnzxvJ7/LGpu92bK@kroah.com>
Date:   Thu, 12 May 2022 13:38:36 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Eugeniu Rosca <erosca@...adit-jv.com>
Cc:     Alan Stern <stern@...land.harvard.edu>,
        Mathias Nyman <mathias.nyman@...ux.intel.com>,
        Kai-Heng Feng <kai.heng.feng@...onical.com>,
        Rajat Jain <rajatja@...gle.com>, Andrew Lunn <andrew@...n.ch>,
        Chris Chiu <chris.chiu@...onical.com>,
        Marek Szyprowski <m.szyprowski@...sung.com>,
        linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
        Naveen kumar Sunkari <naveenkumar.sunkari@...bosch.com>,
        Bhuvanesh Surachari <Bhuvanesh_Surachari@...tor.com>,
        Eugeniu Rosca <rosca.eugeniu@...il.com>
Subject: Re: [PATCH] usb: hub: Simplify error and success path in
 port_over_current_notify

On Thu, May 12, 2022 at 01:15:27PM +0200, Eugeniu Rosca wrote:
> From: Bhuvanesh Surachari <Bhuvanesh_Surachari@...tor.com>
> 
> kasprintf() returns NULL or valid pointer. Since kfree() can handle
> NULL pointer condition, simplify error and success paths in function
> port_over_current_notify() by removing multiple error path labels.
> 
> Signed-off-by: Bhuvanesh Surachari <Bhuvanesh_Surachari@...tor.com>
> Signed-off-by: Eugeniu Rosca <erosca@...adit-jv.com>
> ---
>  drivers/usb/core/hub.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 1460857026e0..9ab8abf14790 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -5511,7 +5511,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
>  /* Handle notifying userspace about hub over-current events */
>  static void port_over_current_notify(struct usb_port *port_dev)
>  {
> -	char *envp[3];
> +	char *envp[3] = { NULL, NULL, NULL };
>  	struct device *hub_dev;
>  	char *port_dev_path;
>  
> @@ -5533,15 +5533,13 @@ static void port_over_current_notify(struct usb_port *port_dev)
>  	envp[1] = kasprintf(GFP_KERNEL, "OVER_CURRENT_COUNT=%u",
>  			port_dev->over_current_count);
>  	if (!envp[1])
> -		goto exit;
> +		goto exit_path;

No need to rename this, right?

>  
> -	envp[2] = NULL;
>  	kobject_uevent_env(&hub_dev->kobj, KOBJ_CHANGE, envp);
>  
> +exit_path:
>  	kfree(envp[1]);
> -exit:

Move this up one line?

thanks,

greg k-h