diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-09-23 16:15:35 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 12:00:51 -0600 |
| commit | 03b147083a2f9a2a3fbbd2505fa88ffa3c6ab194 (patch) | |
| tree | 9d0005b45bfff8d9ec23857d4e317311d6875d1b /drivers/scsi | |
| parent | f619106bdd9d197c947f07108af57946f19a7f7e (diff) | |
| download | linux-3.10-03b147083a2f9a2a3fbbd2505fa88ffa3c6ab194.tar.gz linux-3.10-03b147083a2f9a2a3fbbd2505fa88ffa3c6ab194.tar.bz2 linux-3.10-03b147083a2f9a2a3fbbd2505fa88ffa3c6ab194.zip | |
[SCSI] scsi_lib: fix potential NULL dereference
Stanse found a potential NULL dereference in scsi_kill_request.
Instead of triggering BUG() in 'if (unlikely(cmd == NULL))' branch,
the kernel will Oops earlier on cmd dereference.
Move the dereferences after the if.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 108655230b5..e495d381394 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1359,9 +1359,9 @@ static int scsi_lld_busy(struct request_queue *q) static void scsi_kill_request(struct request *req, struct request_queue *q) { struct scsi_cmnd *cmd = req->special; - struct scsi_device *sdev = cmd->device; - struct scsi_target *starget = scsi_target(sdev); - struct Scsi_Host *shost = sdev->host; + struct scsi_device *sdev; + struct scsi_target *starget; + struct Scsi_Host *shost; blk_start_request(req); @@ -1371,6 +1371,9 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) BUG(); } + sdev = cmd->device; + starget = scsi_target(sdev); + shost = sdev->host; scsi_init_cmd_errh(cmd); cmd->result = DID_NO_CONNECT << 16; atomic_inc(&cmd->device->iorequest_cnt); |