scsi: smartpqi: Replace one-element arrays with flexible-array members
Subsystems (2)
PATCH 1/1 scsi: smartpqi: Replace one-element arrays with flexible-array members
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in a couple of structures, and refactor the rest of the code, accordingly.
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy().
This results in no differences in binary output.
--- drivers/scsi/smartpqi/smartpqi.h | 4 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/smartpqi/smartpqi.h +2 -2
@@ -982,12 +982,12 @@ struct report_phys_lun_16byte_wwid {struct report_phys_lun_8byte_wwid_list {struct report_lun_header header; -struct report_phys_lun_8byte_wwid lun_entries[1 ]; +struct report_phys_lun_8byte_wwid lun_entries[]; };struct report_phys_lun_16byte_wwid_list {struct report_lun_header header; -struct report_phys_lun_16byte_wwid lun_entries[1 ]; +struct report_phys_lun_16byte_wwid lun_entries[]; };struct raid_map_disk_data {
drivers/scsi/smartpqi/smartpqi_init.c +2 -3
@@ -1203,7 +1203,6 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **bunsigned int i;u8 rpl_response_format;u32 num_physicals; -size_t rpl_16byte_wwid_list_length;void *rpl_list;struct report_lun_header *rpl_header;struct report_phys_lun_8byte_wwid_list *rpl_8byte_wwid_list;
@@ -1232,9 +1231,9 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b rpl_8byte_wwid_list = rpl_list; num_physicals =get_unaligned_be32 (&rpl_8byte_wwid_list->header.list_length) /sizeof (rpl_8byte_wwid_list->lun_entries[0 ]); - rpl_16byte_wwid_list_length =sizeof (struct report_lun_header ) + (num_physicals *sizeof (struct report_phys_lun_16byte_wwid )); - rpl_16byte_wwid_list =kmalloc (rpl_16byte_wwid_list_length,GFP_KERNEL ); + rpl_16byte_wwid_list =kmalloc (struct_size (rpl_16byte_wwid_list, lun_entries, + num_physicals),GFP_KERNEL );if (!rpl_16byte_wwid_list)return -ENOMEM ;
Signature · 1 line
2.34.1
Quoted 5 lines · Gustavo A. R. Silva
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in a couple of structures, and refactor the rest of the code, accordingly.
Quoted 8 lines
This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy().This results in no differences in binary output.
Signature · 1 line
Kees Cook
Martin K. Petersen
AppliedGustavo,
Quoted 4 lines
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in a couple of structures, and refactor the rest of the code, accordingly.
Applied to 6.5/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Gustavo A. R. Silva
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in a couple of structures, and refactor the rest of the code, accordingly.
This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy().[...]
Applied to 6.5/scsi-queue, thanks!
[1/1] scsi: smartpqi: Replace one-element arrays with flexible-array members
https://git.kernel.org/mkp/scsi/c/6f0a92fd7db1
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering