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

Commit ef7014d7 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines 



commit 5cbdae10bf11f96e30b4d14de7b08c8b490e903c upstream.

Commit e6f77540 ("scsi: qla2xxx: Fix an integer overflow in sysfs
code") incorrectly set 'optrom_region_size' to 'start+size', which can
overflow option-rom boundaries when 'start' is non-zero.  Continue setting
optrom_region_size to the proper adjusted value of 'size'.

Fixes: e6f77540 ("scsi: qla2xxx: Fix an integer overflow in sysfs code")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAndrew Vasquez <andrewv@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7a793ca1

drivers/scsi/qla2xxx/qla_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, 
		}



		ha->optrom_region_start = start;

		ha->optrom_region_size = start + size;

		ha->optrom_region_size = size;



		ha->optrom_state = QLA_SREADING;

		ha->optrom_buffer = vmalloc(ha->optrom_region_size);
@@ -418,7 +418,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj, 
		}



		ha->optrom_region_start = start;

		ha->optrom_region_size = start + size;

		ha->optrom_region_size = size;



		ha->optrom_state = QLA_SWRITING;

		ha->optrom_buffer = vmalloc(ha->optrom_region_size);