Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ae711a2 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Free the pd if ib_query_qp() fails 



If ib_query_qp() fails or the memory registration mode isn't
supported, don't leak the PD. An orphaned IB/core resource will
cause IB module removal to hang.

Fixes: bd7ed1d1 ("RPC/RDMA: check selected memory registration ...")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent afadc468

net/sunrpc/xprtrdma/verbs.c

+7 −3
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
	if (rc) {

		dprintk("RPC:       %s: ib_query_device failed %d\n",

			__func__, rc);

		goto out2;

		goto out3;

	}



	if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {
@@ -672,14 +672,14 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
				"phys register failed with %lX\n",

				__func__, PTR_ERR(ia->ri_bind_mem));

			rc = -ENOMEM;

			goto out2;

			goto out3;

		}

		break;

	default:

		printk(KERN_ERR "RPC: Unsupported memory "

				"registration mode: %d\n", memreg);

		rc = -ENOMEM;

		goto out2;

		goto out3;

	}

	dprintk("RPC:       %s: memory registration strategy is %d\n",

		__func__, memreg);
@@ -689,6 +689,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 


	rwlock_init(&ia->ri_qplock);

	return 0;



out3:

	ib_dealloc_pd(ia->ri_pd);

	ia->ri_pd = NULL;

out2:

	rdma_destroy_id(ia->ri_id);

	ia->ri_id = NULL;