* [PATCH] ethtool: stats: Use struct_group() to clear all stats at once
@ 2021-11-18 20:34 Kees Cook
2021-11-19 12:00 ` patchwork-bot+netdevbpf
2021-11-19 14:27 ` Jakub Kicinski
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2021-11-18 20:34 UTC (permalink / raw)
To: David S. Miller
Cc: Kees Cook, Jakub Kicinski, Ido Schimmel, YueHaibing,
linux-kernel, netdev, linux-hardening
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.
Add struct_group() to mark region of struct stats_reply_data that should
be initialized, which can now be done in a single memset() call.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
net/ethtool/stats.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/net/ethtool/stats.c b/net/ethtool/stats.c
index ec07f5765e03..a20e0a24ff61 100644
--- a/net/ethtool/stats.c
+++ b/net/ethtool/stats.c
@@ -14,10 +14,12 @@ struct stats_req_info {
struct stats_reply_data {
struct ethnl_reply_data base;
- struct ethtool_eth_phy_stats phy_stats;
- struct ethtool_eth_mac_stats mac_stats;
- struct ethtool_eth_ctrl_stats ctrl_stats;
- struct ethtool_rmon_stats rmon_stats;
+ struct_group(stats,
+ struct ethtool_eth_phy_stats phy_stats;
+ struct ethtool_eth_mac_stats mac_stats;
+ struct ethtool_eth_ctrl_stats ctrl_stats;
+ struct ethtool_rmon_stats rmon_stats;
+ );
const struct ethtool_rmon_hist_range *rmon_ranges;
};
@@ -117,10 +119,7 @@ static int stats_prepare_data(const struct ethnl_req_info *req_base,
/* Mark all stats as unset (see ETHTOOL_STAT_NOT_SET) to prevent them
* from being reported to user space in case driver did not set them.
*/
- memset(&data->phy_stats, 0xff, sizeof(data->phy_stats));
- memset(&data->mac_stats, 0xff, sizeof(data->mac_stats));
- memset(&data->ctrl_stats, 0xff, sizeof(data->ctrl_stats));
- memset(&data->rmon_stats, 0xff, sizeof(data->rmon_stats));
+ memset(&data->stats, 0xff, sizeof(data->stats));
if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask) &&
dev->ethtool_ops->get_eth_phy_stats)
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ethtool: stats: Use struct_group() to clear all stats at once
2021-11-18 20:34 [PATCH] ethtool: stats: Use struct_group() to clear all stats at once Kees Cook
@ 2021-11-19 12:00 ` patchwork-bot+netdevbpf
2021-11-19 14:27 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-11-19 12:00 UTC (permalink / raw)
To: Kees Cook
Cc: davem, kuba, idosch, yuehaibing, linux-kernel, netdev, linux-hardening
Hello:
This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Thu, 18 Nov 2021 12:34:56 -0800 you wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memset(), avoid intentionally writing across
> neighboring fields.
>
> Add struct_group() to mark region of struct stats_reply_data that should
> be initialized, which can now be done in a single memset() call.
>
> [...]
Here is the summary with links:
- ethtool: stats: Use struct_group() to clear all stats at once
https://git.kernel.org/netdev/net-next/c/812ad3d270cb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ethtool: stats: Use struct_group() to clear all stats at once
2021-11-18 20:34 [PATCH] ethtool: stats: Use struct_group() to clear all stats at once Kees Cook
2021-11-19 12:00 ` patchwork-bot+netdevbpf
@ 2021-11-19 14:27 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2021-11-19 14:27 UTC (permalink / raw)
To: Kees Cook
Cc: David S. Miller, Ido Schimmel, YueHaibing, linux-kernel, netdev,
linux-hardening
On Thu, 18 Nov 2021 12:34:56 -0800 Kees Cook wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memset(), avoid intentionally writing across
> neighboring fields.
>
> Add struct_group() to mark region of struct stats_reply_data that should
> be initialized, which can now be done in a single memset() call.
No objection to the patch, but the commit message does not work
for this one ;)
> diff --git a/net/ethtool/stats.c b/net/ethtool/stats.c
> index ec07f5765e03..a20e0a24ff61 100644
> --- a/net/ethtool/stats.c
> +++ b/net/ethtool/stats.c
> @@ -14,10 +14,12 @@ struct stats_req_info {
>
> struct stats_reply_data {
> struct ethnl_reply_data base;
> - struct ethtool_eth_phy_stats phy_stats;
> - struct ethtool_eth_mac_stats mac_stats;
> - struct ethtool_eth_ctrl_stats ctrl_stats;
> - struct ethtool_rmon_stats rmon_stats;
> + struct_group(stats,
> + struct ethtool_eth_phy_stats phy_stats;
> + struct ethtool_eth_mac_stats mac_stats;
> + struct ethtool_eth_ctrl_stats ctrl_stats;
> + struct ethtool_rmon_stats rmon_stats;
> + );
> const struct ethtool_rmon_hist_range *rmon_ranges;
> };
>
> @@ -117,10 +119,7 @@ static int stats_prepare_data(const struct ethnl_req_info *req_base,
> /* Mark all stats as unset (see ETHTOOL_STAT_NOT_SET) to prevent them
> * from being reported to user space in case driver did not set them.
> */
> - memset(&data->phy_stats, 0xff, sizeof(data->phy_stats));
> - memset(&data->mac_stats, 0xff, sizeof(data->mac_stats));
> - memset(&data->ctrl_stats, 0xff, sizeof(data->ctrl_stats));
> - memset(&data->rmon_stats, 0xff, sizeof(data->rmon_stats));
> + memset(&data->stats, 0xff, sizeof(data->stats));
>
> if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask) &&
> dev->ethtool_ops->get_eth_phy_stats)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-19 14:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 20:34 [PATCH] ethtool: stats: Use struct_group() to clear all stats at once Kees Cook
2021-11-19 12:00 ` patchwork-bot+netdevbpf
2021-11-19 14:27 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).