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

Commit 64d29bd8 authored by Bradley Grove's avatar Bradley Grove Committed by James Bottomley
Browse files

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



Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBradley Grove <bgrove@attotech.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c88d2ddd

drivers/scsi/esas2r/esas2r_flash.c

+6 −1
Original line number Diff line number Diff line
@@ -860,8 +860,13 @@ bool esas2r_process_fs_ioctl(struct esas2r_adapter *a, 
		return false;

	}



	if (fsc->command >= cmdcnt) {

		fs->status = ATTO_STS_INV_FUNC;

		return false;

	}



	func = cmd_to_fls_func[fsc->command];

	if (fsc->command >= cmdcnt || func == 0xFF) {

	if (func == 0xFF) {

		fs->status = ATTO_STS_INV_FUNC;

		return false;

	}

drivers/scsi/esas2r/esas2r_init.c

+2 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ void esas2r_kill_adapter(int i) 


int esas2r_cleanup(struct Scsi_Host *host)

{

	struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata;

	struct esas2r_adapter *a;

	int index;



	if (host == NULL) {
@@ -678,6 +678,7 @@ int esas2r_cleanup(struct Scsi_Host *host) 
	}



	esas2r_debug("esas2r_cleanup called for host %p", host);

	a = (struct esas2r_adapter *)host->hostdata;

	index = a->index;

	esas2r_kill_adapter(index);

	return index;