Commit 32221df6 authored May 09, 2020 by Arnd Bergmann Committed by Kalle Valo May 12, 2020

ath10k: fix ath10k_pci struct layout



gcc-10 correctly points out a bug with a zero-length array in
struct ath10k_pci:

drivers/net/wireless/ath/ath10k/ahb.c: In function 'ath10k_ahb_remove':
drivers/net/wireless/ath/ath10k/ahb.c:30:9: error: array subscript 0 is outside the bounds of an interior zero-length array 'struct ath10k_ahb[0]' [-Werror=zero-length-bounds]
   30 |  return &((struct ath10k_pci *)ar->drv_priv)->ahb[0];
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/net/wireless/ath/ath10k/ahb.c:13:
drivers/net/wireless/ath/ath10k/pci.h:185:20: note: while referencing 'ahb'
  185 |  struct ath10k_ahb ahb[0];
      |                    ^~~

The last addition to the struct ignored the comments and added
new members behind the array that must remain last.

Change it to a flexible-array member and move it last again to
make it work correctly, prevent the same thing from happening
again (all compilers warn about flexible-array members in the
middle of a struct) and get it to build without warnings.

Fixes: 521fc37b ("ath10k: Avoid override CE5 configuration for QCA99X0 chipsets")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200509120707.188595-2-arnd@arndb.de

parent 9f12bebd

drivers/net/wireless/ath/ath10k/pci.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -178,15 +178,16 @@ struct ath10k_pci {
		*/
		u32 (targ_cpu_to_ce_addr)(struct ath10k ar, u32 addr);

		struct ce_attr *attr;
		struct ce_pipe_config *pipe_config;
		struct ce_service_to_pipe *serv_to_pipe;

		/* Keep this entry in the last, memory for struct ath10k_ahb is
		* allocated (ahb support enabled case) in the continuation of
		* this struct.
		*/
		struct ath10k_ahb ahb[0];
		struct ath10k_ahb ahb[];

		struct ce_attr *attr;
		struct ce_pipe_config *pipe_config;
		struct ce_service_to_pipe *serv_to_pipe;
		};

		static inline struct ath10k_pci ath10k_pci_priv(struct ath10k ar)

Admin message