|
@@ -318,6 +318,8 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
|
|
|
return -EINVAL;
|
|
|
if (start > ha->optrom_size)
|
|
|
return -EINVAL;
|
|
|
+ if (size > ha->optrom_size - start)
|
|
|
+ size = ha->optrom_size - start;
|
|
|
|
|
|
mutex_lock(&ha->optrom_mutex);
|
|
|
switch (val) {
|
|
@@ -343,8 +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_size ?
|
|
|
- ha->optrom_size - start : size;
|
|
|
+ ha->optrom_region_size = start + size;
|
|
|
|
|
|
ha->optrom_state = QLA_SREADING;
|
|
|
ha->optrom_buffer = vmalloc(ha->optrom_region_size);
|
|
@@ -417,8 +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_size ?
|
|
|
- ha->optrom_size - start : size;
|
|
|
+ ha->optrom_region_size = start + size;
|
|
|
|
|
|
ha->optrom_state = QLA_SWRITING;
|
|
|
ha->optrom_buffer = vmalloc(ha->optrom_region_size);
|