* [PATCH] scsi: pm8001: Replace one-element array with flexible-array member
@ 2022-09-22 19:30 Gustavo A. R. Silva
2022-09-23 6:51 ` Jinpu Wang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2022-09-22 19:30 UTC (permalink / raw)
To: Jack Wang, James E.J. Bottomley, Martin K. Petersen
Cc: linux-scsi, linux-kernel, Gustavo A. R. Silva, linux-hardening
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in struct fw_control_info.
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE
routines on memcpy() and help us make progress towards globally
enabling -fstrict-flex-arrays=3 [1].
Link: https://github.com/KSPP/linux/issues/79
Link: https://github.com/KSPP/linux/issues/207
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101836 [1]
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/scsi/pm8001/pm8001_sas.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index c5e3f380a01c..b08f52673889 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -612,7 +612,7 @@ struct fw_control_info {
operations.*/
u32 reserved;/* padding required for 64 bit
alignment */
- u8 buffer[1];/* Start of buffer */
+ u8 buffer[];/* Start of buffer */
};
struct fw_control_ex {
struct fw_control_info *fw_control;
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: pm8001: Replace one-element array with flexible-array member
2022-09-22 19:30 [PATCH] scsi: pm8001: Replace one-element array with flexible-array member Gustavo A. R. Silva
@ 2022-09-23 6:51 ` Jinpu Wang
2022-09-24 5:21 ` Kees Cook
2022-09-25 17:10 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Jinpu Wang @ 2022-09-23 6:51 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Jack Wang, James E.J. Bottomley, Martin K. Petersen, linux-scsi,
linux-kernel, linux-hardening
On Thu, Sep 22, 2022 at 9:30 PM Gustavo A. R. Silva
<gustavoars@kernel.org> wrote:
>
> One-element arrays are deprecated, and we are replacing them with flexible
> array members instead. So, replace one-element array with flexible-array
> member in struct fw_control_info.
>
> This helps with the ongoing efforts to tighten the FORTIFY_SOURCE
> routines on memcpy() and help us make progress towards globally
> enabling -fstrict-flex-arrays=3 [1].
>
> Link: https://github.com/KSPP/linux/issues/79
> Link: https://github.com/KSPP/linux/issues/207
> Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101836 [1]
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
> ---
> drivers/scsi/pm8001/pm8001_sas.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
> index c5e3f380a01c..b08f52673889 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.h
> +++ b/drivers/scsi/pm8001/pm8001_sas.h
> @@ -612,7 +612,7 @@ struct fw_control_info {
> operations.*/
> u32 reserved;/* padding required for 64 bit
> alignment */
> - u8 buffer[1];/* Start of buffer */
> + u8 buffer[];/* Start of buffer */
> };
> struct fw_control_ex {
> struct fw_control_info *fw_control;
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: pm8001: Replace one-element array with flexible-array member
2022-09-22 19:30 [PATCH] scsi: pm8001: Replace one-element array with flexible-array member Gustavo A. R. Silva
2022-09-23 6:51 ` Jinpu Wang
@ 2022-09-24 5:21 ` Kees Cook
2022-09-25 17:10 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2022-09-24 5:21 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Jack Wang, James E.J. Bottomley, Martin K. Petersen, linux-scsi,
linux-kernel, linux-hardening
On Thu, Sep 22, 2022 at 02:30:28PM -0500, Gustavo A. R. Silva wrote:
> One-element arrays are deprecated, and we are replacing them with flexible
> array members instead. So, replace one-element array with flexible-array
> member in struct fw_control_info.
I think this changelog should include some explanation of why this change
is safe. As far as I can see, it would be:
This is the only change needed; struct fw_control_info is only ever used
for casting to existing allocations. No sizeof() is used on any of the
resulting variables.
> This helps with the ongoing efforts to tighten the FORTIFY_SOURCE
> routines on memcpy() and help us make progress towards globally
> enabling -fstrict-flex-arrays=3 [1].
>
> Link: https://github.com/KSPP/linux/issues/79
> Link: https://github.com/KSPP/linux/issues/207
> Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101836 [1]
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Another one down! :)
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: pm8001: Replace one-element array with flexible-array member
2022-09-22 19:30 [PATCH] scsi: pm8001: Replace one-element array with flexible-array member Gustavo A. R. Silva
2022-09-23 6:51 ` Jinpu Wang
2022-09-24 5:21 ` Kees Cook
@ 2022-09-25 17:10 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2022-09-25 17:10 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Jack Wang, James E.J. Bottomley, Martin K. Petersen, linux-scsi,
linux-kernel, linux-hardening
Gustavo,
> One-element arrays are deprecated, and we are replacing them with
> flexible array members instead. So, replace one-element array with
> flexible-array member in struct fw_control_info.
Applied to 6.1/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-25 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-22 19:30 [PATCH] scsi: pm8001: Replace one-element array with flexible-array member Gustavo A. R. Silva
2022-09-23 6:51 ` Jinpu Wang
2022-09-24 5:21 ` Kees Cook
2022-09-25 17:10 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.