Gustavo A. R. Silva
415edd2d66
net/ipv4/ipv6: Replace one-element arraya with flexible-array members ...
[ Upstream commit db243b796439c0caba47865564d8acd18a301d18 ]
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>
Stable-dep-of: 5c3be3e0eb44 ("ipmr: fix incorrect parameter validation in the ip_mroute_getsockopt() function")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-03-26 18:21:53 -04:00
2020-07-15 20:34:11 -07:00
2024-01-25 14:37:46 -08:00
2021-06-10 13:39:24 +02:00
2020-05-19 12:50:14 -07:00
2024-02-23 08:42:32 +01:00
2023-10-25 11:54:19 +02:00
2023-07-27 08:43:37 +02:00
2019-06-05 17:37:07 +02:00
2023-03-11 16:40:12 +01:00
2022-05-18 10:23:44 +02:00
2020-02-28 14:51:30 +01:00
2021-04-14 08:42:05 +02:00
2023-12-20 15:44:27 +01:00
2020-08-20 18:21:28 +01:00
2024-02-23 08:42:17 +01:00
2022-03-23 09:13:27 +01:00
2022-04-13 21:00:57 +02:00
2022-04-20 09:23:31 +02:00
2019-06-19 17:09:55 +02:00
2020-07-21 18:30:47 -07:00
2022-09-28 11:10:31 +02:00
2023-06-14 11:09:31 +02:00
2019-07-04 12:30:48 -07:00
2023-08-30 16:23:14 +02:00
2020-09-25 13:58:01 -07:00
2022-08-31 17:15:20 +02:00
2019-06-19 17:09:55 +02:00
2023-08-16 18:21:02 +02:00
2020-02-29 14:39:08 +01:00
2022-03-02 11:42:50 +01:00
2020-07-15 07:45:24 -07:00
2020-03-27 19:40:38 -07:00
2024-03-26 18:21:53 -04:00
2020-10-09 12:06:53 -07:00
2020-10-05 05:56:48 -07:00
2019-12-16 16:09:44 -08:00
2021-12-08 09:03:22 +01:00
2022-02-16 12:54:26 +01:00
2024-01-15 18:48:07 +01:00
2023-06-21 15:45:40 +02:00
2020-05-05 13:23:29 -07:00
2022-04-27 13:53:48 +02:00
2020-04-20 07:34:16 +02:00
2019-06-19 17:09:55 +02:00
2019-12-24 22:37:30 -08:00
2021-12-08 09:03:21 +01:00
2022-04-20 09:23:11 +02:00
2022-06-14 18:32:40 +02:00
2023-11-20 11:06:55 +01:00
2020-07-31 09:24:24 +02:00
2020-07-31 09:24:24 +02:00
2019-12-09 10:36:44 -08:00
2019-11-05 18:20:55 -08:00
2023-12-13 18:27:06 +01:00
2020-06-22 21:12:44 -07:00
2019-10-25 16:24:32 -07:00
2021-03-04 11:38:46 +01:00
2020-07-31 09:27:00 +02:00
2022-10-26 13:25:55 +02:00
2023-12-20 15:44:27 +01:00
2022-08-21 15:15:51 +02:00
2020-05-09 00:48:20 +02:00
2024-02-23 08:41:55 +01:00
2020-12-01 17:16:54 -08:00
2022-01-27 10:54:33 +01:00
2022-08-21 15:15:51 +02:00
2022-08-21 15:15:51 +02:00
2019-09-27 12:05:02 +02:00
2020-06-20 17:47:53 -07:00
2022-02-01 17:25:44 +01:00
2021-08-12 13:22:07 +02:00
2022-05-09 09:05:04 +02:00
2023-10-25 11:54:23 +02:00
2023-09-19 12:20:27 +02:00
2023-05-30 12:57:49 +01:00
2023-09-19 12:20:26 +02:00
2022-01-27 10:54:33 +01:00
2021-12-01 09:19:05 +01:00
2023-09-19 12:20:30 +02:00
2020-02-05 14:28:09 +01:00
2019-06-19 17:09:55 +02:00
2020-06-20 17:22:22 -07:00
2019-10-08 13:23:05 -07:00
2024-02-23 08:41:56 +01:00
2021-11-18 14:04:27 +01:00
2023-09-19 12:20:09 +02:00
2021-06-23 14:42:52 +02:00
2023-10-25 11:54:14 +02:00
2020-03-02 11:16:27 -08:00
2020-02-29 21:52:20 -08:00
2020-02-28 12:08:37 -08:00
2020-05-29 21:20:20 -07:00
2023-01-14 10:16:51 +01:00
2023-01-14 10:16:18 +01:00
2020-08-24 06:40:07 -07:00
2023-06-21 15:45:40 +02:00
2021-06-23 14:42:44 +02:00
2020-10-09 20:22:32 -07:00
2019-11-12 08:18:03 -08:00
2021-10-06 15:55:53 +02:00
2021-12-01 09:19:03 +01:00
2021-05-19 10:13:17 +02:00
2020-03-04 13:25:55 -08:00
2021-06-03 09:00:51 +02:00
2023-07-27 08:44:24 +02:00
2022-11-10 18:14:26 +01:00
2021-08-18 08:59:11 +02:00
2022-07-21 21:20:10 +02:00
2021-04-14 08:42:07 +02:00
2020-07-31 09:24:23 +02:00
2020-08-24 14:35:00 -07:00
2022-06-09 10:21:09 +02:00
2023-06-14 11:09:42 +02:00
2023-08-30 16:23:13 +02:00
2023-05-30 12:57:56 +01:00
2023-05-17 11:47:47 +02:00
2022-05-30 09:33:23 +02:00
2020-06-04 15:39:32 -07:00
2020-09-28 15:19:03 -07:00
2019-10-05 16:29:00 -07:00
2022-10-30 09:41:19 +01:00
2023-11-28 16:54:50 +00:00
2021-11-18 14:04:27 +01:00
2022-12-02 17:39:57 +01:00
2024-03-01 13:16:49 +01:00
2019-10-04 14:07:07 -07:00
2022-07-21 21:20:13 +02:00
2020-06-23 20:10:15 -07:00
2020-06-18 20:46:23 -07:00
2022-04-08 14:39:54 +02:00
2023-04-26 11:27:41 +02:00
2023-04-26 11:27:41 +02:00
2019-11-14 18:12:17 -08:00
2023-08-11 11:57:50 +02:00
2020-07-15 20:34:02 -07:00
2019-12-09 10:28:43 -08:00
2019-11-16 12:39:10 -08:00
2020-08-31 21:15:04 +02:00
2021-01-17 14:17:05 +01:00
2020-12-09 16:27:42 +01:00
2023-06-28 10:28:10 +02:00
2023-05-17 11:47:50 +02:00
415edd2d66