summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Rausch <gerd.rausch@oracle.com>2021-06-24 11:55:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-19 09:44:53 +0200
commit3d08b5917984f737f32d5bee9737b9075c3895c6 (patch)
tree411028bb0af81e8b45669f6ca93c59e30b3107c0
parenta8585fdf42b5f066f05cb12f122c382dc668cd7e (diff)
downloadlinux-stable-3d08b5917984f737f32d5bee9737b9075c3895c6.tar.gz
linux-stable-3d08b5917984f737f32d5bee9737b9075c3895c6.tar.bz2
linux-stable-3d08b5917984f737f32d5bee9737b9075c3895c6.zip
RDMA/cma: Fix rdma_resolve_route() memory leak
[ Upstream commit 74f160ead74bfe5f2b38afb4fcf86189f9ff40c9 ] Fix a memory leak when "mda_resolve_route() is called more than once on the same "rdma_cm_id". This is possible if cma_query_handler() triggers the RDMA_CM_EVENT_ROUTE_ERROR flow which puts the state machine back and allows rdma_resolve_route() to be called again. Link: https://lore.kernel.org/r/f6662b7b-bdb7-2706-1e12-47c61d3474b6@oracle.com Signed-off-by: Gerd Rausch <gerd.rausch@oracle.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/infiniband/core/cma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 0c879e40bd18..34b94e525390 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2793,7 +2793,8 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv,
cma_init_resolve_route_work(work, id_priv);
- route->path_rec = kmalloc(sizeof *route->path_rec, GFP_KERNEL);
+ if (!route->path_rec)
+ route->path_rec = kmalloc(sizeof *route->path_rec, GFP_KERNEL);
if (!route->path_rec) {
ret = -ENOMEM;
goto err1;