2019-08-13 10:07:54

by Wenwen Wang

Subject: [PATCH] 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, redirect the execution to the label 'err3'
before returning the error.

Signed-off-by: Wenwen Wang <[email protected]>
---
drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 829dd60..d16a251 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 err3;
}
}

--
2.7.4

2019-08-13 11:05:14

by Sudarsana Reddy Kalluru

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

> -----Original Message-----
> From: Wenwen Wang <[email protected]>
> Sent: Tuesday, August 13, 2019 3:35 PM
> To: Wenwen Wang <[email protected]>
> Cc: 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: [EXT] [PATCH] qed: Add cleanup in qed_slowpath_start()
>
> External Email
>
> ----------------------------------------------------------------------
> If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to
> memory leaks. To fix this issue, redirect the execution to the label 'err3'
> before returning the error.
>
> Signed-off-by: Wenwen Wang <[email protected]>
> ---
> drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c
> b/drivers/net/ethernet/qlogic/qed/qed_main.c
> index 829dd60..d16a251 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 err3;

In this case, we might need to free the ll2-buf allocated at the below path (?),
1312 /* Allocate LL2 interface if needed */
1313 if (QED_LEADING_HWFN(cdev)->using_ll2) {
1314 rc = qed_ll2_alloc_if(cdev);
May be by adding a new goto label 'err4'.

> }
> }
>
> --
> 2.7.4

2019-08-21 05:27:21

by Wenwen Wang

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

On Tue, Aug 13, 2019 at 6:46 AM Sudarsana Reddy Kalluru
<[email protected]> wrote:
>
> > -----Original Message-----
> > From: Wenwen Wang <[email protected]>
> > Sent: Tuesday, August 13, 2019 3:35 PM
> > To: Wenwen Wang <[email protected]>
> > Cc: 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: [EXT] [PATCH] qed: Add cleanup in qed_slowpath_start()
> >
> > External Email
> >
> > ----------------------------------------------------------------------
> > If qed_mcp_send_drv_version() fails, no cleanup is executed, leading to
> > memory leaks. To fix this issue, redirect the execution to the label 'err3'
> > before returning the error.
> >
> > Signed-off-by: Wenwen Wang <[email protected]>
> > ---
> > drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c
> > b/drivers/net/ethernet/qlogic/qed/qed_main.c
> > index 829dd60..d16a251 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 err3;
>
> In this case, we might need to free the ll2-buf allocated at the below path (?),
> 1312 /* Allocate LL2 interface if needed */
> 1313 if (QED_LEADING_HWFN(cdev)->using_ll2) {
> 1314 rc = qed_ll2_alloc_if(cdev);
> May be by adding a new goto label 'err4'.

Thanks for your suggestion! I will rework the patch.

Wenwen

>
> > }
> > }
> >
> > --
> > 2.7.4
>