Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33f1c6c3 authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 5513c5f6

drivers/firewire/fw-sbp2.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}