lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device

Browse Source 
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>
This commit is contained in:
Stefan Richter
2008-02-19 09:05:49 +01:00
parent 5513c5f6f9
commit 33f1c6c352
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firewire/fw-sbp2.c
View File

@@ -762,9 +762,10 @@ static void sbp2_release_target(struct kref *kref)
sbp2_unblock(tgt); sbp2_unblock(tgt);
list_for_each_entry_safe(lu, next, &tgt->lu_list, link) { list_for_each_entry_safe(lu, next, &tgt->lu_list, link) {
if (lu->sdev) if (lu->sdev) {
scsi_remove_device(lu->sdev); scsi_remove_device(lu->sdev);
scsi_device_put(lu->sdev);
}
sbp2_send_management_orb(lu, tgt->node_id, lu->generation, sbp2_send_management_orb(lu, tgt->node_id, lu->generation,
SBP2_LOGOUT_REQUEST, lu->login_id, NULL); SBP2_LOGOUT_REQUEST, lu->login_id, NULL);
@@ -886,12 +887,11 @@ static void sbp2_login(struct work_struct *work)
if (IS_ERR(sdev)) if (IS_ERR(sdev))
goto out_logout_login; goto out_logout_login;
scsi_device_put(sdev);
/* Unreported error during __scsi_add_device() */ /* Unreported error during __scsi_add_device() */
smp_rmb(); /* get current card generation */ smp_rmb(); /* get current card generation */
if (generation != device->card->generation) { if (generation != device->card->generation) {
scsi_remove_device(sdev); scsi_remove_device(sdev);
scsi_device_put(sdev);
goto out_logout_login; goto out_logout_login;
} }