Merge branch 'sctp-nested-flex-arrays'
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2023 07:19:30 +0000 (08:19 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2023 07:19:30 +0000 (08:19 +0100)
commite2598dbd21279d355d9c808eb14d336b94e3c788
treecdbc45676febaf1c04d4e10a8c51dc23dded8f90
parent2f3a247c3994ece3acb7616965b656622bbf5243
parentdbda0fba7a14f14835c34d59fd329cb90a887862
Merge branch 'sctp-nested-flex-arrays'

Xin Long says:

====================
sctp: fix a plenty of flexible-array-nested warnings

Paolo noticed a compile warning in SCTP,

../net/sctp/stream_sched_fc.c: note: in included file (through ../include/net/sctp/sctp.h):
../include/net/sctp/structs.h:335:41: warning: array of flexible structures

But not only this, there are actually quite a lot of such warnings in
some SCTP structs. This patchset fixes most of warnings by deleting
these nested flexible array members.

After this patchset, there are still some warnings left:

  # make C=2 CF="-Wflexible-array-nested" M=./net/sctp/
  ./include/net/sctp/structs.h:1145:41: warning: nested flexible array
  ./include/uapi/linux/sctp.h:641:34: warning: nested flexible array
  ./include/uapi/linux/sctp.h:643:34: warning: nested flexible array
  ./include/uapi/linux/sctp.h:644:33: warning: nested flexible array
  ./include/uapi/linux/sctp.h:650:40: warning: nested flexible array
  ./include/uapi/linux/sctp.h:653:39: warning: nested flexible array

the 1st is caused by __data[] in struct ip_options, not in SCTP;
the others are in uapi, and we should not touch them.

Note that instead of completely deleting it, we just leave it as a
comment in the struct, signalling to the reader that we do expect
such variable parameters over there, as Marcelo suggested.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>