Commit 67f852ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'flexible-array-member-5.7-rc5' of... 

Merge tag 'flexible-array-member-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull flex-array reverts from Gustavo Silva:
 "This reverts flexible array changes in include/uapi/

  These structures can get embedded in other structures in user-space
  and cause all sorts of warnings and problems[1]. So, we better don't
  take any chances and keep the zero-length arrays in place for now"

[1] https://lore.kernel.org/lkml/20200424121553.GE26002@ziepe.ca/

* tag 'flexible-array-member-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  uapi: revert flexible-array conversions
parents 9d82973e 1e6e9d0f

include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct bpf_insn { 
/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */

struct bpf_lpm_trie_key {

	__u32	prefixlen;	/* up to 32 for AF_INET, 128 for AF_INET6 */

	__u8	data[];	/* Arbitrary size */

	__u8	data[0];	/* Arbitrary size */

};



struct bpf_cgroup_storage_key {

include/uapi/linux/dlm_device.h

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ struct dlm_lock_params { 
	void __user *bastaddr;

	struct dlm_lksb __user *lksb;

	char lvb[DLM_USER_LVB_LEN];

	char name[];

	char name[0];

};



struct dlm_lspace_params {

	__u32 flags;

	__u32 minor;

	char name[];

	char name[0];

};



struct dlm_purge_params {

include/uapi/linux/fiemap.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct fiemap { 
	__u32 fm_mapped_extents;/* number of extents that were mapped (out) */

	__u32 fm_extent_count;  /* size of fm_extents array (in) */

	__u32 fm_reserved;

	struct fiemap_extent fm_extents[]; /* array of mapped extents (out) */

	struct fiemap_extent fm_extents[0]; /* array of mapped extents (out) */

};



#define FIEMAP_MAX_OFFSET	(~0ULL)

include/uapi/linux/if_arcnet.h

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct arc_rfc1201 { 
	__u8  proto;		/* protocol ID field - varies		*/

	__u8  split_flag;	/* for use with split packets		*/

	__be16   sequence;	/* sequence number			*/

	__u8  payload[];	/* space remaining in packet (504 bytes)*/

	__u8  payload[0];	/* space remaining in packet (504 bytes)*/

};

#define RFC1201_HDR_SIZE 4
@@ -69,7 +69,7 @@ struct arc_rfc1201 { 
 */

struct arc_rfc1051 {

	__u8 proto;		/* ARC_P_RFC1051_ARP/RFC1051_IP	*/

	__u8 payload[];	/* 507 bytes			*/

	__u8 payload[0];	/* 507 bytes			*/

};

#define RFC1051_HDR_SIZE 1
@@ -80,7 +80,7 @@ struct arc_rfc1051 { 
struct arc_eth_encap {

	__u8 proto;		/* Always ARC_P_ETHER			*/

	struct ethhdr eth;	/* standard ethernet header (yuck!)	*/

	__u8 payload[];	/* 493 bytes				*/

	__u8 payload[0];	/* 493 bytes				*/

};

#define ETH_ENCAP_HDR_SIZE 14

include/uapi/linux/mmc/ioctl.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct mmc_ioc_cmd { 
 */

struct mmc_ioc_multi_cmd {

	__u64 num_of_cmds;

	struct mmc_ioc_cmd cmds[];

	struct mmc_ioc_cmd cmds[0];

};



#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE