diff options
| author | Trond Myklebust | 2015-10-02 21:49:33 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2015-10-02 21:49:33 +0200 |
| commit | 8dbb09570d16929fefd492410d60a918bc18ad5b (patch) | |
| tree | f95439d65d53bfb2dcd1adb37ac1d9ff3c1de7c3 /net/sunrpc/xprtrdma/verbs.c | |
| parent | nfs4: reset states to use open_stateid when returning delegation voluntarily (diff) | |
| parent | xprtrdma: disconnect and flush cqs before freeing buffers (diff) | |
| download | kernel-qcow2-linux-8dbb09570d16929fefd492410d60a918bc18ad5b.tar.gz kernel-qcow2-linux-8dbb09570d16929fefd492410d60a918bc18ad5b.tar.xz kernel-qcow2-linux-8dbb09570d16929fefd492410d60a918bc18ad5b.zip | |
Merge tag 'nfs-rdma-for-4.3-2' of git://git.linux-nfs.org/projects/anna/nfs-rdma
NFS: NFSoRDMA bugfix
Fixes a use-after-free bug.
Signed-off-by: Anna Schumaker <Anna.Schumaker@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/verbs.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index eb081ad05e33..8a477e27bad7 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -755,19 +755,22 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) cancel_delayed_work_sync(&ep->rep_connect_worker); - if (ia->ri_id->qp) { + if (ia->ri_id->qp) rpcrdma_ep_disconnect(ep, ia); + + rpcrdma_clean_cq(ep->rep_attr.recv_cq); + rpcrdma_clean_cq(ep->rep_attr.send_cq); + + if (ia->ri_id->qp) { rdma_destroy_qp(ia->ri_id); ia->ri_id->qp = NULL; } - rpcrdma_clean_cq(ep->rep_attr.recv_cq); rc = ib_destroy_cq(ep->rep_attr.recv_cq); if (rc) dprintk("RPC: %s: ib_destroy_cq returned %i\n", __func__, rc); - rpcrdma_clean_cq(ep->rep_attr.send_cq); rc = ib_destroy_cq(ep->rep_attr.send_cq); if (rc) dprintk("RPC: %s: ib_destroy_cq returned %i\n", |