diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-19 09:05:49 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-19 19:57:23 +0100 |
| commit | 33f1c6c3529f5f279e2e98e5cca0c5bac152153b (patch) | |
| tree | 5eceff887057fb621e4e96c1eb51665ff6d91669 | |
| parent | 5513c5f6f9bd8c8ad3727130910fa288c62526a7 (diff) | |
| download | kernel-crypto-33f1c6c3529f5f279e2e98e5cca0c5bac152153b.tar.gz kernel-crypto-33f1c6c3529f5f279e2e98e5cca0c5bac152153b.tar.xz kernel-crypto-33f1c6c3529f5f279e2e98e5cca0c5bac152153b.zip | |
firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device
Fix a kernel bug when unplugging an SBP-2 device after having its
scsi_device already removed via the "delete" sysfs attribute.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 60ebcb5fe21..5259491580f 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c @@ -762,9 +762,10 @@ static void sbp2_release_target(struct kref *kref) sbp2_unblock(tgt); list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { - if (lu->sdev) + if (lu->sdev) { scsi_remove_device(lu->sdev); - + scsi_device_put(lu->sdev); + } sbp2_send_management_orb(lu, tgt->node_id, lu->generation, SBP2_LOGOUT_REQUEST, lu->login_id, NULL); @@ -886,12 +887,11 @@ static void sbp2_login(struct work_struct *work) if (IS_ERR(sdev)) goto out_logout_login; - scsi_device_put(sdev); - /* Unreported error during __scsi_add_device() */ smp_rmb(); /* get current card generation */ if (generation != device->card->generation) { scsi_remove_device(sdev); + scsi_device_put(sdev); goto out_logout_login; } |