* [PATCH v2] qed: Add cleanup in qed_slowpath_start()
@ 2019-08-21 4:46 Wenwen Wang
2019-08-21 5:03 ` Sudarsana Reddy Kalluru
2019-08-22 23:11 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Wenwen Wang @ 2019-08-21 4:46 UTC (permalink / raw)
To: Wenwen Wang
Cc: Sudarsana Reddy Kalluru, Ariel Elior,
supporter:QLOGIC QL4xxx ETHERNET DRIVER, David S. Miller,
open list:QLOGIC QL4xxx ETHERNET DRIVER, open list
If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to
memory leaks. To fix this issue, introduce the label 'err4' to perform the
cleanup work before returning the error.
Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
---
drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 829dd60..1efff7f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -1325,7 +1325,7 @@ static int qed_slowpath_start(struct qed_dev *cdev,
&drv_version);
if (rc) {
DP_NOTICE(cdev, "Failed sending drv version command\n");
- return rc;
+ goto err4;
}
}
@@ -1333,6 +1333,8 @@ static int qed_slowpath_start(struct qed_dev *cdev,
return 0;
+err4:
+ qed_ll2_dealloc_if(cdev);
err3:
qed_hw_stop(cdev);
err2:
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v2] qed: Add cleanup in qed_slowpath_start()
2019-08-21 4:46 [PATCH v2] qed: Add cleanup in qed_slowpath_start() Wenwen Wang
@ 2019-08-21 5:03 ` Sudarsana Reddy Kalluru
2019-08-22 23:11 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sudarsana Reddy Kalluru @ 2019-08-21 5:03 UTC (permalink / raw)
To: Wenwen Wang
Cc: Ariel Elior, GR-everest-linux-l2, David S. Miller,
open list:QLOGIC QL4xxx ETHERNET DRIVER, open list
> -----Original Message-----
> From: Wenwen Wang <wenwen@cs.uga.edu>
> Sent: Wednesday, August 21, 2019 10:17 AM
> To: Wenwen Wang <wenwen@cs.uga.edu>
> Cc: Sudarsana Reddy Kalluru <skalluru@marvell.com>; Ariel Elior
> <aelior@marvell.com>; GR-everest-linux-l2 <GR-everest-linux-
> l2@marvell.com>; David S. Miller <davem@davemloft.net>; open
> list:QLOGIC QL4xxx ETHERNET DRIVER <netdev@vger.kernel.org>; open list
> <linux-kernel@vger.kernel.org>
> Subject: [PATCH v2] qed: Add cleanup in qed_slowpath_start()
>
> If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to
> memory leaks. To fix this issue, introduce the label 'err4' to perform the
> cleanup work before returning the error.
>
> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> ---
> drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c
> b/drivers/net/ethernet/qlogic/qed/qed_main.c
> index 829dd60..1efff7f 100644
> --- a/drivers/net/ethernet/qlogic/qed/qed_main.c
> +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
> @@ -1325,7 +1325,7 @@ static int qed_slowpath_start(struct qed_dev
> *cdev,
> &drv_version);
> if (rc) {
> DP_NOTICE(cdev, "Failed sending drv version
> command\n");
> - return rc;
> + goto err4;
> }
> }
>
> @@ -1333,6 +1333,8 @@ static int qed_slowpath_start(struct qed_dev
> *cdev,
>
> return 0;
>
> +err4:
> + qed_ll2_dealloc_if(cdev);
> err3:
> qed_hw_stop(cdev);
> err2:
> --
> 2.7.4
Acked-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] qed: Add cleanup in qed_slowpath_start()
2019-08-21 4:46 [PATCH v2] qed: Add cleanup in qed_slowpath_start() Wenwen Wang
2019-08-21 5:03 ` Sudarsana Reddy Kalluru
@ 2019-08-22 23:11 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-08-22 23:11 UTC (permalink / raw)
To: wenwen; +Cc: skalluru, aelior, GR-everest-linux-l2, netdev, linux-kernel
From: Wenwen Wang <wenwen@cs.uga.edu>
Date: Tue, 20 Aug 2019 23:46:36 -0500
> If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to
> memory leaks. To fix this issue, introduce the label 'err4' to perform the
> cleanup work before returning the error.
>
> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-22 23:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-21 4:46 [PATCH v2] qed: Add cleanup in qed_slowpath_start() Wenwen Wang
2019-08-21 5:03 ` Sudarsana Reddy Kalluru
2019-08-22 23:11 ` David Miller
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).