android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethtool: netlink: Add missing ethnl_ops_begin/complete

Browse Source 
[ Upstream commit f1172f3ee3a98754d95b968968920a7d03fdebcc ]

Accessing an ethernet device that is powered off or clock gated might
cause the CPU to hang. Add ethnl_ops_begin/complete in
ethnl_set_features() to protect against this.

Fixes: 0980bfcd69 ("ethtool: set netdev features with FEATURES_SET request")
Signed-off-by: Ludvig Pärsson <ludvig.parsson@axis.com>
Link: https://lore.kernel.org/r/20240117-etht2-v2-1-1a96b6e8c650@axis.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ludvig Pärsson 2024-01-17 13:03:14 +01:00 committed by Greg Kroah-Hartman
parent 7809296dc1
commit f2cc7d90a8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ethtool/features.c
View File

@ -234,17 +234,20 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)
dev = req_info.dev; dev = req_info.dev;
rtnl_lock(); rtnl_lock();
ret = ethnl_ops_begin(dev);
if (ret < 0)
goto out_rtnl;
ethnl_features_to_bitmap(old_active, dev->features); ethnl_features_to_bitmap(old_active, dev->features);
ethnl_features_to_bitmap(old_wanted, dev->wanted_features); ethnl_features_to_bitmap(old_wanted, dev->wanted_features);
ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT, ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT,
tb[ETHTOOL_A_FEATURES_WANTED], tb[ETHTOOL_A_FEATURES_WANTED],
netdev_features_strings, info->extack); netdev_features_strings, info->extack);
if (ret < 0) if (ret < 0)
goto out_rtnl; goto out_ops;
if (ethnl_bitmap_to_features(req_mask) & ~NETIF_F_ETHTOOL_BITS) { if (ethnl_bitmap_to_features(req_mask) & ~NETIF_F_ETHTOOL_BITS) {
GENL_SET_ERR_MSG(info, "attempt to change non-ethtool features"); GENL_SET_ERR_MSG(info, "attempt to change non-ethtool features");
ret = -EINVAL; ret = -EINVAL;
goto out_rtnl; goto out_ops;
} }
/* set req_wanted bits not in req_mask from old_wanted */ /* set req_wanted bits not in req_mask from old_wanted */
@ -281,6 +284,8 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)
if (mod) if (mod)
netdev_features_change(dev); netdev_features_change(dev);
out_ops:
ethnl_ops_complete(dev);
out_rtnl: out_rtnl:
rtnl_unlock(); rtnl_unlock();
ethnl_parse_header_dev_put(&req_info); ethnl_parse_header_dev_put(&req_info);