cifs: Replace zero-length arrays with flexible-array members
Subsystems (2)
PATCH 1/1 cifs: Replace zero-length arrays with flexible-array members
Zero-length arrays are deprecated[1] and we are moving towards adopting C99 flexible-array members instead. So, replace zero-length arrays in a couple of structures with flex-array members.
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 [2].
--- fs/cifs/ntlmssp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/cifs/ntlmssp.h +2 -2
@@ -83,7 +83,7 @@ typedef struct _NEGOTIATE_MESSAGE {SECURITY_BUFFER WorkstationName;/* RFC 1001 and ASCII */ /* SECURITY_BUFFER for version info not present since we do not set the version is present flag */ -char DomainString[0 ]; +char DomainString[];/* followed by WorkstationString */ } __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE;
@@ -135,7 +135,7 @@ typedef struct _AUTHENTICATE_MESSAGE {__le32 NegotiateFlags;/* SECURITY_BUFFER for version info not present since we do not set the version is present flag */ -char UserString[0 ]; +char UserString[]; } __attribute__((packed)) AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;/*
Signature · 1 line
2.34.1
Quoted 4 lines · Gustavo A. R. Silva
Zero-length arrays are deprecated[1] and we are moving towards adopting C99 flexible-array members instead. So, replace zero-length arrays in a couple of structures with flex-array members.
Quoted 8 lines
This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy()and help us make progress towards globally enabling -fstrict-flex-arrays=3 [2].
Signature · 1 line
Kees Cook
Steve French
Appliedmerged into cifs-2.6.git for-next
Quoted 19 lines · Kees Cook
Quoted 4 lines · Gustavo A. R. Silva
Zero-length arrays are deprecated[1] and we are moving towards adopting C99 flexible-array members instead. So, replace zero-length arrays in a couple of structures with flex-array members.
Quoted 8 lines
This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy()and help us make progress towards globally enabling -fstrict-flex-arrays=3 [2].Reviewed-by Kees Cook <[email protected]>--
Kees Cook
Signature · 3 lines
Thanks, Steve