Commit 66e05225 authored Dec 12, 2005 by Brian King Committed by Linus Torvalds Dec 12, 2005

[PATCH] Fix SCSI scanning slab corruption



There is a double free in the scsi scan code if a LLDD's slave_alloc()
call fails.  There is a direct call to scsi_free_queue and then the
following put_device calls the release function, which also frees the
queue.

Remove the redundant scsi_free_queue.

Signed-off-by: Brian King <brking@us.ibm.com>
Tested-by: Nathan Lynch <ntl@pobox.com>
[ Also removed some strange whitespace artifacts in that area ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 49d7bc64

drivers/scsi/scsi_scan.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -266,8 +266,6 @@ static struct scsi_device scsi_alloc_sdev(struct scsi_target starget,
		/*
		* if LLDD reports slave not present, don't clutter
		* console with alloc failure messages


		*/
		if (ret == -ENXIO)
		display_failure_msg = 0;
		@@ -279,7 +277,6 @@ static struct scsi_device scsi_alloc_sdev(struct scsi_target starget,

		out_device_destroy:
		transport_destroy_device(&sdev->sdev_gendev);
		scsi_free_queue(sdev->request_queue);
		put_device(&sdev->sdev_gendev);
		out:
		if (display_failure_msg)

Admin message