mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Justin Chen <justin.chen@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/1686179653-29750-1-git-send-email-justin.chen@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Justin Chen 2023-06-07 16:14:11 -07:00 committed by Jakub Kicinski
parent 68bd67b43f
commit 55b24334c0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ethtool/ioctl.c
View File

@ -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;