Commit bb26224e authored by Justin Tee's avatar Justin Tee Committed by Martin K. Petersen

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.

Link: https://github.com/KSPP/linux/issues/160Co-developed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Co-developed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20230531223319.24328-1-justintee8345@gmail.comReviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9c24f90f
...@@ -3748,8 +3748,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, ...@@ -3748,8 +3748,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport,
rap->obj[0].entity_id_len = vmid->vmid_len; rap->obj[0].entity_id_len = vmid->vmid_len;
memcpy(rap->obj[0].entity_id, vmid->host_vmid, vmid->vmid_len); memcpy(rap->obj[0].entity_id, vmid->host_vmid, vmid->vmid_len);
size = RAPP_IDENT_OFFSET + size = RAPP_IDENT_OFFSET +
sizeof(struct lpfc_vmid_rapp_ident_list) + struct_size(rap, obj, be32_to_cpu(rap->no_of_objects));
sizeof(struct entity_id_object);
retry = 1; retry = 1;
break; break;
...@@ -3768,8 +3767,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport, ...@@ -3768,8 +3767,7 @@ lpfc_vmid_cmd(struct lpfc_vport *vport,
dap->obj[0].entity_id_len = vmid->vmid_len; dap->obj[0].entity_id_len = vmid->vmid_len;
memcpy(dap->obj[0].entity_id, vmid->host_vmid, vmid->vmid_len); memcpy(dap->obj[0].entity_id, vmid->host_vmid, vmid->vmid_len);
size = DAPP_IDENT_OFFSET + size = DAPP_IDENT_OFFSET +
sizeof(struct lpfc_vmid_dapp_ident_list) + struct_size(dap, obj, be32_to_cpu(dap->no_of_objects));
sizeof(struct entity_id_object);
write_lock(&vport->vmid_lock); write_lock(&vport->vmid_lock);
vmid->flag &= ~LPFC_VMID_REGISTERED; vmid->flag &= ~LPFC_VMID_REGISTERED;
write_unlock(&vport->vmid_lock); write_unlock(&vport->vmid_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment