| Message ID | ZGKHByxujJoygK+l@work (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | cbb3debbb1630132a39e90058861f1c1d01dffb6 |
| Headers | show |
| Series | [next] wifi: wil6210: fw: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper | expand |
On Mon, May 15, 2023 at 01:24:55PM -0600, Gustavo A. R. Silva wrote: > Zero-length arrays are deprecated, and we are moving towards adopting > C99 flexible-array members, instead. So, replace zero-length arrays > declarations alone in structs with the new DECLARE_FLEX_ARRAY() > helper macro. > > This helper allows for flexible-array members alone in structs. > > Link: https://github.com/KSPP/linux/issues/193 > Link: https://github.com/KSPP/linux/issues/287 > Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Mon, May 15, 2023 at 01:24:55PM -0600, Gustavo A. R. Silva wrote: > Zero-length arrays are deprecated, and we are moving towards adopting > C99 flexible-array members, instead. So, replace zero-length arrays > declarations alone in structs with the new DECLARE_FLEX_ARRAY() > helper macro. > > This helper allows for flexible-array members alone in structs. > > Link: https://github.com/KSPP/linux/issues/193 > Link: https://github.com/KSPP/linux/issues/287 > Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org>
"Gustavo A. R. Silva" <gustavoars@kernel.org> wrote: > Zero-length arrays are deprecated, and we are moving towards adopting > C99 flexible-array members, instead. So, replace zero-length arrays > declarations alone in structs with the new DECLARE_FLEX_ARRAY() > helper macro. > > This helper allows for flexible-array members alone in structs. > > Link: https://github.com/KSPP/linux/issues/193 > Link: https://github.com/KSPP/linux/issues/287 > Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Reviewed-by: Kees Cook <keescook@chromium.org> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. cbb3debbb163 wifi: wil6210: fw: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper
diff --git a/drivers/net/wireless/ath/wil6210/fw.h b/drivers/net/wireless/ath/wil6210/fw.h index 440614d61156..aa1620e0d24f 100644 --- a/drivers/net/wireless/ath/wil6210/fw.h +++ b/drivers/net/wireless/ath/wil6210/fw.h @@ -47,7 +47,7 @@ struct wil_fw_record_fill { /* type == wil_fw_type_fill */ * for informational purpose, data_size is @head.size from record header */ struct wil_fw_record_comment { /* type == wil_fw_type_comment */ - u8 data[0]; /* free-form data [data_size], see above */ + DECLARE_FLEX_ARRAY(u8, data); /* free-form data [data_size], see above */ } __packed; /* Comment header - common for all comment record types */ @@ -131,7 +131,7 @@ struct wil_fw_data_dwrite { * data_size is @head.size where @head is record header */ struct wil_fw_record_direct_write { /* type == wil_fw_type_direct_write */ - struct wil_fw_data_dwrite data[0]; + DECLARE_FLEX_ARRAY(struct wil_fw_data_dwrite, data); } __packed; /* verify condition: [@addr] & @mask == @value
Zero-length arrays are deprecated, and we are moving towards adopting C99 flexible-array members, instead. So, replace zero-length arrays declarations alone in structs with the new DECLARE_FLEX_ARRAY() helper macro. This helper allows for flexible-array members alone in structs. Link: https://github.com/KSPP/linux/issues/193 Link: https://github.com/KSPP/linux/issues/287 Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- drivers/net/wireless/ath/wil6210/fw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)