evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] esas2r: smatch - Fix dereference that occurs prior to check

Browse source 
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bradley Grove <bgrove@attotech.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Bradley Grove 2013-08-29 15:55:40 -04:00 • committed by James Bottomley
parent c88d2dddb0
commit 64d29bd83e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/scsi/esas2r/esas2r_flash.c
View file

@ -860,8 +860,13 @@ bool esas2r_process_fs_ioctl(struct esas2r_adapter *a,
return false; return false;
} }
if (fsc->command >= cmdcnt) {
fs->status = ATTO_STS_INV_FUNC;
return false;
}
func = cmd_to_fls_func[fsc->command]; func = cmd_to_fls_func[fsc->command];
if (fsc->command >= cmdcnt || func == 0xFF) { if (func == 0xFF) {
fs->status = ATTO_STS_INV_FUNC; fs->status = ATTO_STS_INV_FUNC;
return false; return false;
} }

3
drivers/scsi/esas2r/esas2r_init.c
View file

@ -665,7 +665,7 @@ void esas2r_kill_adapter(int i)
int esas2r_cleanup(struct Scsi_Host *host) int esas2r_cleanup(struct Scsi_Host *host)
{ {
struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata; struct esas2r_adapter *a;
int index; int index;
if (host == NULL) { if (host == NULL) {
@ -678,6 +678,7 @@ int esas2r_cleanup(struct Scsi_Host *host)
} }
esas2r_debug("esas2r_cleanup called for host %p", host); esas2r_debug("esas2r_cleanup called for host %p", host);
a = (struct esas2r_adapter *)host->hostdata;
index = a->index; index = a->index;
esas2r_kill_adapter(index); esas2r_kill_adapter(index);
return index; return index;