* [PATCH 2/2] usb: typec: fix memory leak
@ 2022-03-08 6:56 Yeqi Fu
2022-03-08 7:09 ` Greg Kroah-Hartman
2022-03-08 7:28 ` Heikki Krogerus
0 siblings, 2 replies; 3+ messages in thread
From: Yeqi Fu @ 2022-03-08 6:56 UTC (permalink / raw)
To: Heikki Krogerus, Greg Kroah-Hartman
Cc: linux-usb, linux-kernel, lyz_cs, Yeqi Fu
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(+)
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);
}
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] usb: typec: fix memory leak
2022-03-08 6:56 [PATCH 2/2] usb: typec: fix memory leak Yeqi Fu
@ 2022-03-08 7:09 ` Greg Kroah-Hartman
2022-03-08 7:28 ` Heikki Krogerus
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2022-03-08 7:09 UTC (permalink / raw)
To: Yeqi Fu; +Cc: Heikki Krogerus, linux-usb, linux-kernel, lyz_cs, Yeqi Fu
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>
> ---
> 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);
> }
How was this tested?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] usb: typec: fix memory leak
2022-03-08 6:56 [PATCH 2/2] usb: typec: fix memory leak Yeqi Fu
2022-03-08 7:09 ` Greg Kroah-Hartman
@ 2022-03-08 7:28 ` Heikki Krogerus
1 sibling, 0 replies; 3+ messages in thread
From: Heikki Krogerus @ 2022-03-08 7:28 UTC (permalink / raw)
To: Yeqi Fu; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, lyz_cs, Yeqi Fu
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,
--
heikki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-08 7:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-08 6:56 [PATCH 2/2] usb: typec: fix memory leak Yeqi Fu
2022-03-08 7:09 ` Greg Kroah-Hartman
2022-03-08 7:28 ` Heikki Krogerus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).