]> git.karo-electronics.de Git - karo-tx-linux.git/commit
fix oops in scsi_run_queue()
authorJames Bottomley <James.Bottomley@suse.de>
Sun, 1 May 2011 14:42:07 +0000 (09:42 -0500)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:54:47 +0000 (13:54 -0700)
commit9f6340c7bfc445ec0c8c620d79a4cea4a8fe654d
tree195796ee2c66bd4512b8d76c441de7a6ac62cc0a
parentda4e8b8ed55d397cfca5fa4656e7e71e7ba3d688
fix oops in scsi_run_queue()

commit c055f5b2614b4f758ae6cc86733f31fa4c2c5844 upstream.

The recent commit closing the race window in device teardown:

commit 86cbfb5607d4b81b1a993ff689bbd2addd5d3a9b
Author: James Bottomley <James.Bottomley@suse.de>
Date:   Fri Apr 22 10:39:59 2011 -0500

    [SCSI] put stricter guards on queue dead checks

is causing a potential NULL deref in scsi_run_queue() because the
q->queuedata may already be NULL by the time this function is called.
Since we shouldn't be running a queue that is being torn down, simply
add a NULL check in scsi_run_queue() to forestall this.

Tested-by: Jim Schutt <jaschut@sandia.gov>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/scsi/scsi_lib.c