Replace one-element arrays with flexible-array members
Subsystems (2)
cover Replace one-element arrays with flexible-array members
Hi!
This series aims to replace one-element arrays with flexible-array members.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
Thanks
Gustavo A. R. Silva (4):
scsi: megaraid_sas: Replace one-element array with flexible-array
member in MR_FW_RAID_MAP_ALL
scsi: megaraid_sas: Replace one-element array with flexible-array
member in MR_FW_RAID_MAP_DYNAMIC
scsi: megaraid_sas: Replace one-element array with flexible-array
member in MR_DRV_RAID_MAP
scsi: megaraid_sas: Replace one-element array with flexible-array
member in MR_PD_CFG_SEQ_NUM_SYNC
drivers/scsi/megaraid/megaraid_sas_base.c | 20 ++++++++++---------- drivers/scsi/megaraid/megaraid_sas_fp.c | 12 ++++++------ drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- drivers/scsi/megaraid/megaraid_sas_fusion.h | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-)
Signature · 1 line
2.27.0
PATCH 1/4 scsi: megaraid_sas: Replace one-element array with flexible-array member in MR_FW_RAID_MAP_ALL
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2].
Refactor the code according to the use of a flexible-array member in struct MR_FW_RAID_MAP_ALL instead of one-element array, and use the struct_size() helper.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays
--- drivers/scsi/megaraid/megaraid_sas_base.c | 6 +++--- drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +++--- drivers/scsi/megaraid/megaraid_sas_fusion.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +3 -3
@@ -5147,9 +5147,9 @@ static void megasas_update_ext_vd_details(struct megasas_instance *instance) fusion->current_map_sz = ventura_map_sz; fusion->max_map_sz = ventura_map_sz; }else { - fusion->old_map_sz =sizeof (struct MR_FW_RAID_MAP ) + - (sizeof (struct MR_LD_SPAN_MAP ) * - (instance->fw_supported_vd_count -1 )); + fusion->old_map_sz = +struct_size ((struct MR_FW_RAID_MAP *)0 , ldSpanMap, + instance->fw_supported_vd_count); fusion->new_map_sz =sizeof (struct MR_FW_RAID_MAP_EXT ); fusion->max_map_sz =
drivers/scsi/megaraid/megaraid_sas_fp.c +3 -3
@@ -326,9 +326,9 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id)else if (instance->supportmax256vd) expected_size =sizeof (struct MR_FW_RAID_MAP_EXT );else - expected_size = - (sizeof (struct MR_FW_RAID_MAP ) -sizeof (struct MR_LD_SPAN_MAP ) + - (sizeof (struct MR_LD_SPAN_MAP ) *le16_to_cpu (pDrvRaidMap->ldCount))); + expected_size =struct_size ((struct MR_FW_RAID_MAP *)0 , + ldSpanMap, +le16_to_cpu (pDrvRaidMap->ldCount));if (le32_to_cpu (pDrvRaidMap->totalSize) != expected_size) { dev_dbg(&instance->pdev->dev, "megasas: map info structure size 0x%x",
drivers/scsi/megaraid/megaraid_sas_fusion.h +2 -2
@@ -942,7 +942,7 @@ struct MR_FW_RAID_MAP {u8 reserved2[7 ];struct MR_ARRAY_INFO arMapInfo[MAX_RAIDMAP_ARRAYS ];struct MR_DEV_HANDLE_INFO devHndlInfo[MAX_RAIDMAP_PHYSICAL_DEVICES ]; -struct MR_LD_SPAN_MAP ldSpanMap[1 ]; +struct MR_LD_SPAN_MAP ldSpanMap[]; };struct IO_REQUEST_INFO {
@@ -1147,8 +1147,8 @@ typedef struct LOG_BLOCK_SPAN_INFO { }LD_SPAN_INFO , *PLD_SPAN_INFO ;struct MR_FW_RAID_MAP_ALL { -struct MR_FW_RAID_MAP raidMap;struct MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES -1 ]; +struct MR_FW_RAID_MAP raidMap; } __attribute__ ((packed)); struct MR_DRV_RAID_MAP {
Signature · 1 line
2.27.0
PATCH 2/4 scsi: megaraid_sas: Replace one-element array with flexible-array member in MR_FW_RAID_MAP_DYNAMIC
In reply to Gustavo A. R. SilvaReplace one-element array with a flexible-array member in struct MR_FW_RAID_MAP_DYNAMIC.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
--- drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_fusion.h +1 -1
@@ -1053,7 +1053,7 @@ struct MR_FW_RAID_MAP_DYNAMIC {struct MR_RAID_MAP_DESC_TABLE raid_map_desc_table[RAID_MAP_DESC_TYPE_COUNT ];/* Variable Size buffer containing all data */ -u32 raid_map_desc_data[1 ]; +u32 raid_map_desc_data[]; };/* Dynamicaly sized RAID MAp structure */ #define IEEE_SGE_FLAGS_ADDR_MASK (0x03)
Signature · 1 line
2.27.0
PATCH 3/4 scsi: megaraid_sas: Replace one-element array with flexible-array member in MR_DRV_RAID_MAP
In reply to Gustavo A. R. SilvaReplace one-element array with a flexible-array member in struct MR_DRV_RAID_MAP and use the flex_array_size() helper.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays
--- drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +++--- drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fp.c +3 -3
@@ -229,8 +229,8 @@ static int MR_PopulateDrvRaidMap(struct megasas_instance *instance, u64 map_id) le32_to_cpu(desc_table->raid_map_desc_offset));memcpy (pDrvRaidMap->ldSpanMap, fw_map_dyn->ld_span_map, -sizeof (struct MR_LD_SPAN_MAP ) * -le32_to_cpu (desc_table->raid_map_desc_elements)); +flex_array_size (pDrvRaidMap, ldSpanMap, +le32_to_cpu (desc_table->raid_map_desc_elements)));break ;default : dev_dbg(&instance->pdev->dev, "wrong number of desctableElements %d\n",
@@ -254,7 +254,7 @@ static int MR_PopulateDrvRaidMap(struct megasas_instance *instance, u64 map_id) pDrvRaidMap->ldTgtIdToLd[i] = (u16 )fw_map_ext->ldTgtIdToLd[i];memcpy (pDrvRaidMap->ldSpanMap, fw_map_ext->ldSpanMap, -sizeof (struct MR_LD_SPAN_MAP ) * ld_count); +flex_array_size (pDrvRaidMap, ldSpanMap, ld_count));memcpy (pDrvRaidMap->arMapInfo, fw_map_ext->arMapInfo,sizeof (struct MR_ARRAY_INFO ) *MAX_API_ARRAYS_EXT ); memcpy(pDrvRaidMap->devHndlInfo, fw_map_ext->devHndlInfo,
drivers/scsi/megaraid/megaraid_sas_fusion.h +1 -1
@@ -1182,7 +1182,7 @@ struct MR_DRV_RAID_MAP { devHndlInfo[MAX_RAIDMAP_PHYSICAL_DEVICES_DYN ];u16 ldTgtIdToLd[MAX_LOGICAL_DRIVES_DYN ];struct MR_ARRAY_INFO arMapInfo[MAX_API_ARRAYS_DYN ]; -struct MR_LD_SPAN_MAP ldSpanMap[1 ]; +struct MR_LD_SPAN_MAP ldSpanMap[]; };
Signature · 1 line
2.27.0
PATCH 4/4 scsi: megaraid_sas: Replace one-element array with flexible-array member in MR_PD_CFG_SEQ_NUM_SYNC
In reply to Gustavo A. R. SilvaReplace one-element array with a flexible-array member in struct MR_PD_CFG_SEQ_NUM_SYNC and use the struct_size() helper.
This helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy().
--- drivers/scsi/megaraid/megaraid_sas_base.c | 14 +++++++------- drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +7 -7
@@ -5782,10 +5782,10 @@ megasas_setup_jbod_map(struct megasas_instance *instance) {int i;struct fusion_context *fusion = instance->ctrl_context; -u32 pd_seq_map_sz; +size_t pd_seq_map_sz; - pd_seq_map_sz =sizeof (struct MR_PD_CFG_SEQ_NUM_SYNC ) + - (sizeof (struct MR_PD_CFG_SEQ ) * (MAX_PHYSICAL_DEVICES -1 )); + pd_seq_map_sz =struct_size ((struct MR_PD_CFG_SEQ_NUM_SYNC *)0 , seq, +MAX_PHYSICAL_DEVICES ); instance->use_seqnum_jbod_fp = instance->support_seqnum_jbod_fp;
@@ -7961,7 +7961,7 @@ static void megasas_detach_one(struct pci_dev *pdev)struct Scsi_Host *host;struct megasas_instance *instance;struct fusion_context *fusion; -u32 pd_seq_map_sz; +size_t pd_seq_map_sz; instance =pci_get_drvdata (pdev);
@@ -8033,9 +8033,9 @@ static void megasas_detach_one(struct pci_dev *pdev)if (instance->adapter_type !=MFI_SERIES ) {megasas_release_fusion (instance); - pd_seq_map_sz =sizeof (struct MR_PD_CFG_SEQ_NUM_SYNC ) + - (sizeof (struct MR_PD_CFG_SEQ ) * - (MAX_PHYSICAL_DEVICES -1 )); + pd_seq_map_sz = +struct_size ((struct MR_PD_CFG_SEQ_NUM_SYNC *)0 , + seq,MAX_PHYSICAL_DEVICES );for (i =0 ; i <2 ; i++) {if (fusion->ld_map[i]) dma_free_coherent(&instance->pdev->dev,
drivers/scsi/megaraid/megaraid_sas_fusion.c +1 -1
@@ -1310,7 +1310,7 @@ megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend) { pd_sync = (void *)fusion->pd_seq_sync[(instance->pd_seq_map_id &1 )]; pd_seq_h = fusion->pd_seq_phys[(instance->pd_seq_map_id &1 )]; - pd_seq_map_sz =struct_size (pd_sync, seq,MAX_PHYSICAL_DEVICES -1 ); + pd_seq_map_sz =struct_size (pd_sync, seq,MAX_PHYSICAL_DEVICES ); cmd =megasas_get_cmd (instance);if (!cmd) {
drivers/scsi/megaraid/megaraid_sas_fusion.h +1 -1
@@ -1249,7 +1249,7 @@ struct MR_PD_CFG_SEQ {struct MR_PD_CFG_SEQ_NUM_SYNC {__le32 size;__le32 count; -struct MR_PD_CFG_SEQ seq[1 ]; +struct MR_PD_CFG_SEQ seq[]; } __packed;/* stream detection */
Signature · 1 line
2.27.0