scsi: lpfc: Use struct_size() helper
Subsystems (2)
PATCH v2 1/1 scsi: lpfc: Use struct_size() helper
Prefer struct_size() over open-coded versions of idiom:
sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to contain.
---
Changes in v2:
- Use literal 1 in call to struct_size(), instead of rap->no_of_objects (Kees Cook).
drivers/scsi/lpfc/lpfc_ct.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +2 -6
@@ -3747,9 +3747,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, rap->no_of_objects =cpu_to_be32 (1 ); rap->obj[0 ].entity_id_len = vmid->vmid_len;memcpy (rap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); - size =RAPP_IDENT_OFFSET + -sizeof (struct lpfc_vmid_rapp_ident_list ) + -sizeof (struct entity_id_object ); + size =RAPP_IDENT_OFFSET +struct_size (rap, obj,1 ); retry =1 ;break ;
@@ -3767,9 +3765,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, dap->no_of_objects =cpu_to_be32 (1 ); dap->obj[0 ].entity_id_len = vmid->vmid_len;memcpy (dap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); - size =DAPP_IDENT_OFFSET + -sizeof (struct lpfc_vmid_dapp_ident_list ) + -sizeof (struct entity_id_object ); + size =DAPP_IDENT_OFFSET +struct_size (dap, obj,1 );write_lock (&vport->vmid_lock); vmid->flag &= ~LPFC_VMID_REGISTERED ;write_unlock (&vport->vmid_lock);
Signature · 1 line
2.34.1
no_of_objects may be hardcoded to 1 right now, but does it make more sense to use?
struct_size(rap, obj, be32_to_cpu(rap->no_of_objects));
We probably should have declared no_of_objects as __be32 to have avoided this confusion.
Quoted 50 lines · Gustavo A. R. Silva
Prefer
struct_size()over open-coded versions of idiom:sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to contain.
---
Changes in v2:
- Use literal 1 in call tostruct_size(), instead ofrap->no_of_objects(Kees Cook).drivers/scsi/lpfc/lpfc_ct.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/scsi/lpfc/lpfc_ct.c +2
-7@@ -3747,9 +3747,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, rap->no_of_objects =cpu_to_be32 (1 ); rap->obj[0 ].entity_id_len = vmid->vmid_len;memcpy (rap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); - size =RAPP_IDENT_OFFSET + -sizeof (struct lpfc_vmid_rapp_ident_list ) + -sizeof (struct entity_id_object ); + size =RAPP_IDENT_OFFSET +struct_size (rap, obj,1 ); retry =1 ;break ;@@ -3767,9 +3765,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, dap->no_of_objects =cpu_to_be32 (1 ); dap->obj[0 ].entity_id_len = vmid->vmid_len;memcpy (dap->obj[0 ].entity_id, vmid->host_vmid, vmid->vmid_len); - size =DAPP_IDENT_OFFSET + -sizeof (struct lpfc_vmid_dapp_ident_list ) + -sizeof (struct entity_id_object ); + size =DAPP_IDENT_OFFSET +struct_size (dap, obj,1 );write_lock (&vport->vmid_lock); vmid->flag &= ~LPFC_VMID_REGISTERED ;write_unlock (&vport->vmid_lock); --2.34.1
Quoted 4 lines · Justin Tee
no_of_objectsmay be hardcoded to 1 right now, but does it make more sense to use?
struct_size(rap, obj, be32_to_cpu(rap->no_of_objects));
Oh yeah, that's nicer. :)
Quoted 2 lines
We probably should have declared
no_of_objectsas__be32to have avoided this confusion.
Perhaps this patch can add that too?
Signature · 1 line
Kees Cook
Justin Tee
maintainerQuoted 4 lines
Quoted 2 lines
We probably should have declared
no_of_objectsas__be32to have avoided this confusion.Perhaps this patch can add that too?
Yes, please. Something like this is fine:
drivers/scsi/lpfc/lpfc_hw.h +2 -2
@@ -1414,12 +1414,12 @@ struct app_id_object { };struct lpfc_vmid_rapp_ident_list { -uint32_t no_of_objects; +__be32 no_of_objects;struct entity_id_object obj[1 ]; };struct lpfc_vmid_dapp_ident_list { -uint32_t no_of_objects; +__be32 no_of_objects;struct entity_id_object obj[1 ]; };
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Gustavo/Justin,
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
We probably should have declared
no_of_objectsas__be32to have avoided this confusion.Perhaps this patch can add that too?
Yes, please. Something like this is fine:
Please send a formal patch. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Justin Tee
maintainerHi Martin,
Sure, will do. I'll post the formal patch shortly.
The __be32 no_of_objects comment can be ignored for this patch as I've already incorporated that into another patch with subject line: [PATCH 1/1] lpfc: Fix incorrect big endian type assignments in FDMI and VMID paths
Thanks,
Justin
Quoted 15 lines · Martin K. Petersen
Gustavo/Justin,
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
We probably should have declared
no_of_objectsas__be32to have avoided this confusion.Perhaps this patch can add that too?
Yes, please. Something like this is fine:
Please send a formal patch. Thanks!
--
Martin K. Petersen Oracle Linux Engineering
Signature · 11 lines
This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.