diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2014-05-20 15:03:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-06 18:57:27 -0700 |
| commit | 1ebc929e0e5c4bae8f02701ce017f331ae27a19a (patch) | |
| tree | 569eaa383793639e7b045183969a4c61a171d485 /drivers/infiniband/ulp | |
| parent | d7b861cc493177194d909af54e27b1b0c37ea5c5 (diff) | |
| download | linux-stable-1ebc929e0e5c4bae8f02701ce017f331ae27a19a.tar.gz linux-stable-1ebc929e0e5c4bae8f02701ce017f331ae27a19a.tar.bz2 linux-stable-1ebc929e0e5c4bae8f02701ce017f331ae27a19a.zip | |
IB/srp: Fix a sporadic crash triggered by cable pulling
commit 024ca90151f5e4296d30f72c13ff9a075e23c9ec upstream.
Avoid that the loops that iterate over the request ring can encounter
a pointer to a SCSI command in req->scmnd that is no longer associated
with that request. If the function srp_unmap_data() is invoked twice
for a SCSI command that is not in flight then that would cause
ib_fmr_pool_unmap() to be invoked with an invalid pointer as argument,
resulting in a kernel oops.
Reported-by: Sagi Grimberg <sagig@mellanox.com>
Reference: http://thread.gmane.org/gmane.linux.drivers.rdma/19068/focus=19069
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 529b6bcdca7a..e96c07ee6756 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1576,6 +1576,12 @@ err_unmap: err_iu: srp_put_tx_iu(target, iu, SRP_IU_CMD); + /* + * Avoid that the loops that iterate over the request ring can + * encounter a dangling SCSI command pointer. + */ + req->scmnd = NULL; + spin_lock_irqsave(&target->lock, flags); list_add(&req->list, &target->free_reqs); |