* [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper
@ 2023-06-06 23:22 Gustavo A. R. Silva
2023-06-08 1:28 ` Martin K. Petersen
2023-06-15 2:16 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-06-06 23:22 UTC (permalink / raw)
To: Nilesh Javali, James E.J. Bottomley, Martin K. Petersen
Cc: GR-QLogic-Storage-Upstream, linux-scsi, linux-kernel,
Gustavo A. R. Silva, linux-hardening
One-element arrays as fake flex arrays are deprecated and we are moving
towards adopting C99 flexible-array members, instead. So, replace
one-element array declaration in struct ct_sns_gpnft_rsp, which is
ultimately being used inside a union:
drivers/scsi/qla2xxx/qla_def.h:
3240 struct ct_sns_gpnft_pkt {
3241 union {
3242 struct ct_sns_req req;
3243 struct ct_sns_gpnft_rsp rsp;
3244 } p;
3245 };
Refactor the rest of the code, accordingly.
This issue was found with the help of Coccinelle.
Link: https://github.com/KSPP/linux/issues/245
Link: https://github.com/KSPP/linux/issues/193
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/scsi/qla2xxx/qla_def.h | 4 ++--
drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 35009ce5246a..a9acdec003a3 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3174,12 +3174,12 @@ struct ct_sns_gpnft_rsp {
uint8_t vendor_unique;
};
/* Assume the largest number of targets for the union */
- struct ct_sns_gpn_ft_data {
+ DECLARE_FLEX_ARRAY(struct ct_sns_gpn_ft_data {
u8 control_byte;
u8 port_id[3];
u32 reserved;
u8 port_name[8];
- } entries[1];
+ }, entries);
};
/* CT command response */
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 4738f8935f7f..1cf9d200d563 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3776,8 +3776,8 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
sp->u.iocb_cmd.u.ctarg.req_size = GPN_FT_REQ_SIZE;
rspsz = sizeof(struct ct_sns_gpnft_rsp) +
- ((vha->hw->max_fibre_devices - 1) *
- sizeof(struct ct_sns_gpn_ft_data));
+ vha->hw->max_fibre_devices *
+ sizeof(struct ct_sns_gpn_ft_data);
sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
rspsz,
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper
2023-06-06 23:22 [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper Gustavo A. R. Silva
@ 2023-06-08 1:28 ` Martin K. Petersen
2023-06-15 2:16 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2023-06-08 1:28 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Nilesh Javali, James E.J. Bottomley, Martin K. Petersen,
GR-QLogic-Storage-Upstream, linux-scsi, linux-kernel,
linux-hardening
Gustavo,
> One-element arrays as fake flex arrays are deprecated and we are
> moving towards adopting C99 flexible-array members, instead. So,
> replace one-element array declaration in struct ct_sns_gpnft_rsp,
> which is ultimately being used inside a union:
Applied to 6.5/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper
2023-06-06 23:22 [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper Gustavo A. R. Silva
2023-06-08 1:28 ` Martin K. Petersen
@ 2023-06-15 2:16 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2023-06-15 2:16 UTC (permalink / raw)
To: Nilesh Javali, James E.J. Bottomley, Gustavo A. R. Silva
Cc: Martin K . Petersen, GR-QLogic-Storage-Upstream, linux-scsi,
linux-kernel, linux-hardening
On Tue, 06 Jun 2023 17:22:21 -0600, Gustavo A. R. Silva wrote:
> One-element arrays as fake flex arrays are deprecated and we are moving
> towards adopting C99 flexible-array members, instead. So, replace
> one-element array declaration in struct ct_sns_gpnft_rsp, which is
> ultimately being used inside a union:
>
> drivers/scsi/qla2xxx/qla_def.h:
> 3240 struct ct_sns_gpnft_pkt {
> 3241 union {
> 3242 struct ct_sns_req req;
> 3243 struct ct_sns_gpnft_rsp rsp;
> 3244 } p;
> 3245 };
>
> [...]
Applied to 6.5/scsi-queue, thanks!
[1/1] Replace one-element array with DECLARE_FLEX_ARRAY() helper
https://git.kernel.org/mkp/scsi/c/512a365368c7
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-15 2:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-06 23:22 [RESEND][PATCH][next] Replace one-element array with DECLARE_FLEX_ARRAY() helper Gustavo A. R. Silva
2023-06-08 1:28 ` Martin K. Petersen
2023-06-15 2:16 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).