* [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path
@ 2019-10-24 13:10 Colin King
2019-10-26 3:17 ` oulijun
2019-10-28 16:54 ` Jason Gunthorpe
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2019-10-24 13:10 UTC (permalink / raw)
To: Lijun Ou, Wei Hu, Doug Ledford, Jason Gunthorpe, Tao Tian,
Leon Romanovsky, Yangyang Li, linux-rdma
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently, the error return path when the call to function
dev->dfx->query_cqc_info fails will leak object 'context'. Fix this
by making the error return path via 'err' return return codes rather
than -EMSGSIZE, set ret appropriately for all error return paths and
for the memory leak now return via 'err' with -EINVAL rather than
just returning without freeing context.
Addresses-Coverity: ("Resource leak")
Fixes: e1c9a0dc2939 ("RDMA/hns: Dump detailed driver-specific CQ")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/infiniband/hw/hns/hns_roce_restrack.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/hns/hns_roce_restrack.c b/drivers/infiniband/hw/hns/hns_roce_restrack.c
index a0d608ec81c1..7e4a91dd7329 100644
--- a/drivers/infiniband/hw/hns/hns_roce_restrack.c
+++ b/drivers/infiniband/hw/hns/hns_roce_restrack.c
@@ -94,15 +94,21 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
return -ENOMEM;
ret = hr_dev->dfx->query_cqc_info(hr_dev, hr_cq->cqn, (int *)context);
- if (ret)
- return -EINVAL;
+ if (ret) {
+ ret = -EINVAL;
+ goto err;
+ }
table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);
- if (!table_attr)
+ if (!table_attr) {
+ ret = -EMSGSIZE;
goto err;
+ }
- if (hns_roce_fill_cq(msg, context))
+ if (hns_roce_fill_cq(msg, context)) {
+ ret = -EMSGSIZE;
goto err_cancel_table;
+ }
nla_nest_end(msg, table_attr);
kfree(context);
@@ -113,7 +119,7 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
nla_nest_cancel(msg, table_attr);
err:
kfree(context);
- return -EMSGSIZE;
+ return ret;
}
int hns_roce_fill_res_entry(struct sk_buff *msg,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path
2019-10-24 13:10 [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path Colin King
@ 2019-10-26 3:17 ` oulijun
2019-10-28 16:54 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: oulijun @ 2019-10-26 3:17 UTC (permalink / raw)
To: Colin King, Wei Hu, Doug Ledford, Jason Gunthorpe, Tao Tian,
Leon Romanovsky, Yangyang Li, linux-rdma
Cc: kernel-janitors, linux-kernel
在 2019/10/24 21:10, Colin King 写道:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently, the error return path when the call to function
> dev->dfx->query_cqc_info fails will leak object 'context'. Fix this
> by making the error return path via 'err' return return codes rather
> than -EMSGSIZE, set ret appropriately for all error return paths and
> for the memory leak now return via 'err' with -EINVAL rather than
> just returning without freeing context.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: e1c9a0dc2939 ("RDMA/hns: Dump detailed driver-specific CQ")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/infiniband/hw/hns/hns_roce_restrack.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/hw/hns/hns_roce_restrack.c b/drivers/infiniband/hw/hns/hns_roce_restrack.c
> index a0d608ec81c1..7e4a91dd7329 100644
> --- a/drivers/infiniband/hw/hns/hns_roce_restrack.c
> +++ b/drivers/infiniband/hw/hns/hns_roce_restrack.c
> @@ -94,15 +94,21 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
> return -ENOMEM;
>
> ret = hr_dev->dfx->query_cqc_info(hr_dev, hr_cq->cqn, (int *)context);
> - if (ret)
> - return -EINVAL;
> + if (ret) {
> + ret = -EINVAL;
> + goto err;
Why not remove ret = -EINVAL?
> + }
>
> table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_DRIVER);
> - if (!table_attr)
> + if (!table_attr) {
> + ret = -EMSGSIZE;
> goto err;
> + }
>
> - if (hns_roce_fill_cq(msg, context))
> + if (hns_roce_fill_cq(msg, context)) {
> + ret = -EMSGSIZE;
> goto err_cancel_table;
> + }
>
> nla_nest_end(msg, table_attr);
> kfree(context);
> @@ -113,7 +119,7 @@ static int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
> nla_nest_cancel(msg, table_attr);
> err:
> kfree(context);
> - return -EMSGSIZE;
> + return ret;
> }
>
> int hns_roce_fill_res_entry(struct sk_buff *msg,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path
2019-10-24 13:10 [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path Colin King
2019-10-26 3:17 ` oulijun
@ 2019-10-28 16:54 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2019-10-28 16:54 UTC (permalink / raw)
To: Colin King
Cc: Lijun Ou, Wei Hu, Doug Ledford, Tao Tian, Leon Romanovsky,
Yangyang Li, linux-rdma, kernel-janitors, linux-kernel
On Thu, Oct 24, 2019 at 02:10:34PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently, the error return path when the call to function
> dev->dfx->query_cqc_info fails will leak object 'context'. Fix this
> by making the error return path via 'err' return return codes rather
> than -EMSGSIZE, set ret appropriately for all error return paths and
> for the memory leak now return via 'err' with -EINVAL rather than
> just returning without freeing context.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: e1c9a0dc2939 ("RDMA/hns: Dump detailed driver-specific CQ")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/infiniband/hw/hns/hns_roce_restrack.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
Applied to for-next with the note to remove the EINVAL return
Thanks,
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-28 16:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-24 13:10 [PATCH][next] RDMA/hns: fix memory leak on 'context' on error return path Colin King
2019-10-26 3:17 ` oulijun
2019-10-28 16:54 ` Jason Gunthorpe
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).