diff options
| author | Tom Talpey <tmt@netapp.com> | 2008-02-27 15:04:26 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-07 14:35:32 -0500 |
| commit | ee1a2c564f67407947e89f1dac75ac0af0ba88c7 (patch) | |
| tree | c62ea8d12b876f78662c0f9e0372c6d0d1f0c31a /net | |
| parent | af1b8c2ff7c337c4e96db12d6b7b61eaa91aa069 (diff) | |
| download | linux-3.10-ee1a2c564f67407947e89f1dac75ac0af0ba88c7.tar.gz linux-3.10-ee1a2c564f67407947e89f1dac75ac0af0ba88c7.tar.bz2 linux-3.10-ee1a2c564f67407947e89f1dac75ac0af0ba88c7.zip | |
SUNRPC: Fix a nfs4 over rdma transport oops
Prevent an RPC oops when freeing a dynamically allocated RDMA
buffer, used in certain special-case large metadata operations.
Signed-off-by: Tom Talpey <tmt@netapp.com>
Signed-off-by: James Lentini <jlentini@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtrdma/transport.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 02c522c17de..a564c1a39ec 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -614,7 +614,11 @@ xprt_rdma_free(void *buffer) return; req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]); - r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf); + if (req->rl_iov.length == 0) { /* see allocate above */ + r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer, + struct rpcrdma_xprt, rx_buf); + } else + r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf); rep = req->rl_reply; dprintk("RPC: %s: called on 0x%p%s\n", |