2019-08-21 05:28:33

by Wenwen Wang

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 <[email protected]>
---
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

2019-08-21 05:30:54

by Sudarsana Reddy Kalluru

Subject: RE: [PATCH v2] qed: Add cleanup in qed_slowpath_start()

> -----Original Message-----
> From: Wenwen Wang <[email protected]>
> Sent: Wednesday, August 21, 2019 10:17 AM
> To: Wenwen Wang <[email protected]>
> Cc: Sudarsana Reddy Kalluru <[email protected]>; Ariel Elior
> <[email protected]>; GR-everest-linux-l2 <GR-everest-linux-
> [email protected]>; David S. Miller <[email protected]>; open
> list:QLOGIC QL4xxx ETHERNET DRIVER <[email protected]>; open list
> <[email protected]>
> 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 <[email protected]>
> ---
> 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 <[email protected]>

2019-08-23 08:56:25

by David Miller

Subject: Re: [PATCH v2] qed: Add cleanup in qed_slowpath_start()

From: Wenwen Wang <[email protected]>
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 <[email protected]>

Applied.