diff mbox series

[2/2] usb: typec: fix memory leak

Message ID 20220308065617.90401-1-fufuyqqqqqq@gmail.com
State New
Headers show
Series None | expand

Commit Message

Yeqi Fu March 8, 2022, 6:56 a.m. UTC 
From: Yeqi Fu <fuyq@stu.pku.edu.cn>

Resource release is needed on the error handling branch
to prevent memory leak. Fix this by adding kfree to the
error handling branch.

Signed-off-by: Yeqi Fu <fuyq@stu.pku.edu.cn>
---
 drivers/usb/typec/class.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Heikki Krogerus March 8, 2022, 7:28 a.m. UTC | #1 
On Mon, Mar 07, 2022 at 10:56:17PM -0800, Yeqi Fu wrote:
> From: Yeqi Fu <fuyq@stu.pku.edu.cn>
> 
> Resource release is needed on the error handling branch
> to prevent memory leak. Fix this by adding kfree to the
> error handling branch.
> 
> Signed-off-by: Yeqi Fu <fuyq@stu.pku.edu.cn>

NAK.

That resources are released in the release callback - typec_release()
in this case.

> ---
>  drivers/usb/typec/class.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
> index ee0e520707dd..e210109c696d 100644
> --- a/drivers/usb/typec/class.c
> +++ b/drivers/usb/typec/class.c
> @@ -2099,6 +2099,7 @@ struct typec_port *typec_register_port(struct device *parent,
>  	port->cap = kmemdup(cap, sizeof(*cap), GFP_KERNEL);
>  	if (!port->cap) {
>  		put_device(&port->dev);
> +		kfree(port);
>  		return ERR_PTR(-ENOMEM);
>  	}
>  
> @@ -2106,6 +2107,7 @@ struct typec_port *typec_register_port(struct device *parent,
>  	if (IS_ERR(port->sw)) {
>  		ret = PTR_ERR(port->sw);
>  		put_device(&port->dev);
> +		kfree(port);
>  		return ERR_PTR(ret);
>  	}
>  
> @@ -2113,6 +2115,7 @@ struct typec_port *typec_register_port(struct device *parent,
>  	if (IS_ERR(port->mux)) {
>  		ret = PTR_ERR(port->mux);
>  		put_device(&port->dev);
> +		kfree(port);
>  		return ERR_PTR(ret);
>  	}
>  
> @@ -2120,6 +2123,7 @@ struct typec_port *typec_register_port(struct device *parent,
>  	if (ret) {
>  		dev_err(parent, "failed to register port (%d)\n", ret);
>  		put_device(&port->dev);
> +		kfree(port);
>  		return ERR_PTR(ret);
>  	}

thanks,
diff mbox series

Patch

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index ee0e520707dd..e210109c696d 100644
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -2099,6 +2099,7 @@  struct typec_port *typec_register_port(struct device *parent,
 	port->cap = kmemdup(cap, sizeof(*cap), GFP_KERNEL);
 	if (!port->cap) {
 		put_device(&port->dev);
+		kfree(port);
 		return ERR_PTR(-ENOMEM);
 	}
 
@@ -2106,6 +2107,7 @@  struct typec_port *typec_register_port(struct device *parent,
 	if (IS_ERR(port->sw)) {
 		ret = PTR_ERR(port->sw);
 		put_device(&port->dev);
+		kfree(port);
 		return ERR_PTR(ret);
 	}
 
@@ -2113,6 +2115,7 @@  struct typec_port *typec_register_port(struct device *parent,
 	if (IS_ERR(port->mux)) {
 		ret = PTR_ERR(port->mux);
 		put_device(&port->dev);
+		kfree(port);
 		return ERR_PTR(ret);
 	}
 
@@ -2120,6 +2123,7 @@  struct typec_port *typec_register_port(struct device *parent,
 	if (ret) {
 		dev_err(parent, "failed to register port (%d)\n", ret);
 		put_device(&port->dev);
+		kfree(port);
 		return ERR_PTR(ret);
 	}