Gustavo A. R. Silva
db243b7964
net/ipv4/ipv6: Replace one-element arraya with flexible-array members
There is a regular need in the kernel to provide a way to declare having
a dynamically sized set of trailing elements in a structure. Kernel code
should always use “flexible array members”[1] for these cases. The older
style of one-element or zero-length arrays should no longer be used[2].
Use an anonymous union with a couple of anonymous structs in order to
keep userspace unchanged and refactor the related code accordingly:
$ pahole -C group_filter net/ipv4/ip_sockglue.o
struct group_filter {
union {
struct {
__u32 gf_interface_aux; /* 0 4 */
/* XXX 4 bytes hole, try to pack */
struct __kernel_sockaddr_storage gf_group_aux; /* 8 128 */
/* --- cacheline 2 boundary (128 bytes) was 8 bytes ago --- */
__u32 gf_fmode_aux; /* 136 4 */
__u32 gf_numsrc_aux; /* 140 4 */
struct __kernel_sockaddr_storage gf_slist[1]; /* 144 128 */
}; /* 0 272 */
struct {
__u32 gf_interface; /* 0 4 */
/* XXX 4 bytes hole, try to pack */
struct __kernel_sockaddr_storage gf_group; /* 8 128 */
/* --- cacheline 2 boundary (128 bytes) was 8 bytes ago --- */
__u32 gf_fmode; /* 136 4 */
__u32 gf_numsrc; /* 140 4 */
struct __kernel_sockaddr_storage gf_slist_flex[0]; /* 144 0 */
}; /* 0 144 */
}; /* 0 272 */
/* size: 272, cachelines: 5, members: 1 */
/* last cacheline: 16 bytes */
};
$ pahole -C compat_group_filter net/ipv4/ip_sockglue.o
struct compat_group_filter {
union {
struct {
__u32 gf_interface_aux; /* 0 4 */
struct __kernel_sockaddr_storage gf_group_aux __attribute__((__aligned__(4))); /* 4 128 */
/* --- cacheline 2 boundary (128 bytes) was 4 bytes ago --- */
__u32 gf_fmode_aux; /* 132 4 */
__u32 gf_numsrc_aux; /* 136 4 */
struct __kernel_sockaddr_storage gf_slist[1] __attribute__((__aligned__(4))); /* 140 128 */
} __attribute__((__packed__)) __attribute__((__aligned__(4))); /* 0 268 */
struct {
__u32 gf_interface; /* 0 4 */
struct __kernel_sockaddr_storage gf_group __attribute__((__aligned__(4))); /* 4 128 */
/* --- cacheline 2 boundary (128 bytes) was 4 bytes ago --- */
__u32 gf_fmode; /* 132 4 */
__u32 gf_numsrc; /* 136 4 */
struct __kernel_sockaddr_storage gf_slist_flex[0] __attribute__((__aligned__(4))); /* 140 0 */
} __attribute__((__packed__)) __attribute__((__aligned__(4))); /* 0 140 */
} __attribute__((__aligned__(1))); /* 0 268 */
/* size: 268, cachelines: 5, members: 1 */
/* forced alignments: 1 */
/* last cacheline: 12 bytes */
} __attribute__((__packed__));
This helps with the ongoing efforts to globally enable -Warray-bounds
and get us closer to being able to tighten the FORTIFY_SOURCE routines
on memcpy().
[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays
Link: https://github.com/KSPP/linux/issues/79
Link: https://github.com/KSPP/linux/issues/109
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2021-08-05 11:46:42 +01:00
..
2021-08-04 12:11:52 +02:00
2021-07-07 17:39:15 +02:00
2021-07-28 13:19:31 +01:00
2021-07-15 17:59:09 -07:00
2021-06-22 14:11:57 +02:00
2021-06-22 14:11:57 +02:00
2021-07-01 13:08:18 -07:00
2021-06-22 09:15:35 +02:00
2021-06-22 16:42:09 +02:00
2021-07-28 10:22:43 -07:00
2021-07-29 15:06:50 +01:00
2021-07-20 05:41:20 -07:00
2021-07-29 15:06:50 +01:00
2021-08-03 11:50:22 +01:00
2021-07-21 08:14:33 -07:00
2021-08-05 11:46:42 +01:00
2021-06-30 14:15:39 -06:00
2021-07-21 08:14:33 -07:00
2021-07-21 08:14:33 -07:00
2021-07-21 08:14:33 -07:00
2021-07-21 08:14:33 -07:00
2021-06-25 11:24:24 -04:00
2021-07-21 08:14:33 -07:00
2021-07-08 11:48:21 -07:00
2021-07-29 15:06:50 +01:00
2021-06-30 20:47:29 -07:00
2021-06-30 15:34:04 -06:00
2021-07-01 13:08:18 -07:00
2021-06-18 13:02:45 -07:00
2021-06-23 13:05:09 +02:00
2021-07-27 11:48:42 +01:00
2021-07-06 10:37:46 -05:00
2021-08-02 10:24:38 +01:00
2021-06-22 11:28:51 -07:00
2021-06-28 12:49:52 -07:00
2021-06-23 12:56:08 -07:00
2021-08-04 12:52:03 +01:00
2021-06-30 20:47:27 -07:00
2021-07-03 04:50:51 -04:00