ethtool: ioctl: improve error checking for set_wol
Subsystems (3)
PATCH v2 1/1 ethtool: ioctl: improve error checking for set_wol
The netlink version of set_wol checks for not supported wolopts and avoids setting wol when the correct wolopt is already set. If we do the same with the ioctl version then we can remove these checks from the driver layer.
---
v2
- Return -EINVAL instead of -EOPNOTSUPP
net/ethtool/ioctl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/ethtool/ioctl.c +12 -2
@@ -1436,15 +1436,25 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)static int ethtool_set_wol (struct net_device *dev,char __user *useraddr) { -struct ethtool_wolinfo wol; +struct ethtool_wolinfo wol, cur_wol;int ret; -if (!dev->ethtool_ops->set_wol) +if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)return -EOPNOTSUPP ; +memset (&cur_wol,0 ,sizeof (struct ethtool_wolinfo )); + cur_wol.cmd =ETHTOOL_GWOL ; + dev->ethtool_ops->get_wol (dev, &cur_wol); +if (copy_from_user (&wol, useraddr,sizeof (wol)))return -EFAULT ; +if (wol.wolopts & ~cur_wol.supported) +return -EINVAL ; + +if (wol.wolopts == cur_wol.wolopts) +return 0 ; + ret = dev->ethtool_ops->set_wol (dev, &wol);if (ret)return ret;
Signature · 1 line
2.7.4
Quoted 6 lines · Justin Chen
The netlink version of
set_wolchecks for not supported wolopts and avoids setting wol when the correct wolopt is already set. If we do the same with the ioctl version then we can remove these checks from the driver layer.Reviewed-by Simon Horman <[email protected]>Signed-off-by Justin Chen <[email protected]>
Signature · 1 line
Florian
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 7 Jun 2023 16:14:11 -0700 you wrote:
The netlink version of
set_wolchecks for not supported wolopts and avoids setting wol when the correct wolopt is already set. If we do the same with the ioctl version then we can remove these checks from the driver layer.Reviewed-by Simon Horman <[email protected]>Signed-off-by Justin Chen <[email protected]>[...]
Here is the summary with links:
- [v2,net-next] ethtool: ioctl: improve error checking for set_wol
https://git.kernel.org/netdev/net-next/c/55b24334c0f2
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 35 lines · Justin Chen
The netlink version of
set_wolchecks for not supported wolopts and avoids setting wol when the correct wolopt is already set. If we do the same with the ioctl version then we can remove these checks from the driver layer.Reviewed-by Simon Horman <[email protected]>Signed-off-by Justin Chen <[email protected]>---
v2
- Return-EINVALinstead of-EOPNOTSUPPnet/ethtool/ioctl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)net/ethtool/ioctl.c +6
-2@@ -1436,15 +1436,25 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)static int ethtool_set_wol (struct net_device *dev,char __user *useraddr) { -struct ethtool_wolinfo wol; +struct ethtool_wolinfo wol, cur_wol;int ret; -if (!dev->ethtool_ops->set_wol) +if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)return -EOPNOTSUPP ; +memset (&cur_wol,0 ,sizeof (struct ethtool_wolinfo )); + cur_wol.cmd =ETHTOOL_GWOL ; + dev->ethtool_ops->get_wol (dev, &cur_wol); +if (copy_from_user (&wol, useraddr,sizeof (wol)))return -EFAULT ;
net/ethtool/ioctl.c static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) · line 1460
Quoted 10 lines
net/ethtool/ioctl.c +6
-0+if (wol.wolopts & ~cur_wol.supported) +return -EINVAL ; + +if (wol.wolopts == cur_wol.wolopts) +return 0 ; + ret = dev->ethtool_ops->set_wol (dev, &wol);if (ret)return ret;
Was thinking more about this patch. I realized we don't account for the different sopass case.
# ethtool -s eth0 wol s sopass 11:22:33:44:55:66 # ethtool -s eth0 wol s sopass 22:44:55:66:77:88
For this case, the second sopass values won't be stored.
Can you drop this patch? I will submit another version.
Thanks,
Justin
Jakub Kicinski
maintainerQuoted 8 lines · On Fri, 9 Jun 2023 13:47:22 -0700 Justin Chen wrote:
Was thinking more about this patch. I realized we don't account for the different sopass case.
# ethtool -s eth0 wol s sopass 11:22:33:44:55:66 # ethtool -s eth0 wol s sopass 22:44:55:66:77:88For this case, the second sopass values won't be stored.
Can you drop this patch? I will submit another version.
We can't drop patches, it'd mess up commit IDs and basing trees on top of net-next would be a major PITA for people. Please send a fix on top (with a Fixes tag making it clear that the problem has not reached any -rc kernel).