Commit 55b24334 authored by Justin Chen's avatar Justin Chen Committed by Jakub Kicinski

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.
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJustin Chen <justin.chen@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/1686179653-29750-1-git-send-email-justin.chen@broadcom.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 68bd67b4
...@@ -1436,15 +1436,25 @@ static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) ...@@ -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) static int ethtool_set_wol(struct net_device *dev, char __user *useraddr)
{ {
struct ethtool_wolinfo wol; struct ethtool_wolinfo wol, cur_wol;
int ret; int ret;
if (!dev->ethtool_ops->set_wol) if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)
return -EOPNOTSUPP; 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))) if (copy_from_user(&wol, useraddr, sizeof(wol)))
return -EFAULT; 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); ret = dev->ethtool_ops->set_wol(dev, &wol);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment