diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-04-08 17:55:22 +0530 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 14:00:32 -0500 |
| commit | 980ead3180233d09ad37aacd803059b3142c7863 (patch) | |
| tree | f5d948b5a791b0fdaf6ec9b34682157a54dcd799 | |
| parent | 130b958a5dbf0fca361beef5713715a2eba6529f (diff) | |
| download | linux-3.10-980ead3180233d09ad37aacd803059b3142c7863.tar.gz linux-3.10-980ead3180233d09ad37aacd803059b3142c7863.tar.bz2 linux-3.10-980ead3180233d09ad37aacd803059b3142c7863.zip | |
[SCSI] mpt2sas: Before removing sas_device search device in list for _scsih_sas_device_remove
Fix a oops in _scsih_sas_device_remove. The driver was attempting to
delete a object from the sas_device link list when the object was not
present.
Added sanity check for sas_device NULL dereference.
before deleting sas_device now driver will search device in list then
only it will follow device removal.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 77163bad75f..c5ff26a2a51 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -537,10 +537,15 @@ _scsih_sas_device_remove(struct MPT2SAS_ADAPTER *ioc, { unsigned long flags; + if (!sas_device) + return; + spin_lock_irqsave(&ioc->sas_device_lock, flags); - list_del(&sas_device->list); - memset(sas_device, 0, sizeof(struct _sas_device)); - kfree(sas_device); + if (mpt2sas_scsih_sas_device_find_by_sas_address(ioc, + sas_device->sas_address)) { + list_del(&sas_device->list); + kfree(sas_device); + } spin_unlock_irqrestore(&ioc->sas_device_lock, flags); } |