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

Commit 6431c5dc authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct address range checking for option-rom updates. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 4469c195

drivers/scsi/qla2xxx/qla_attr.c

+1 −8
Original line number Diff line number Diff line
@@ -244,12 +244,6 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj, 
		if (ha->optrom_state != QLA_SWAITING)

			break;



		if (start & 0xfff) {

			qla_printk(KERN_WARNING, ha,

			    "Invalid start region 0x%x/0x%x.\n", start, size);

			return -EINVAL;

		}



		ha->optrom_region_start = start;

		ha->optrom_region_size = start + size > ha->optrom_size ?

		    ha->optrom_size - start : size;
@@ -303,8 +297,7 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj, 
		else if (start == (ha->flt_region_boot * 4) ||

		    start == (ha->flt_region_fw * 4))

			valid = 1;

		else if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) &&

		    start == (ha->flt_region_vpd_nvram * 4))

		else if (IS_QLA25XX(ha) || IS_QLA81XX(ha))

		    valid = 1;

		if (!valid) {

			qla_printk(KERN_WARNING, ha,