From: Justin Chen <justin.chen@broadcom.com>
To: netdev@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com,
florian.fainelli@broadcom.com,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Andrew Lunn <andrew@lunn.ch>,
Daniil Tatianin <d-tatianin@yandex-team.ru>,
Ido Schimmel <idosch@nvidia.com>,
Marco Bonelli <marco@mebeim.net>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Jiri Pirko <jiri@resnulli.us>, Gal Pressman <gal@nvidia.com>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 net-next] ethtool: ioctl: improve error checking for set_wol
Date: Fri, 9 Jun 2023 13:47:22 -0700 [thread overview]
Message-ID: <c512a8ee-cfc7-d0c8-6cf2-442da8dc1f1b@broadcom.com> (raw)
In-Reply-To: <1686179653-29750-1-git-send-email-justin.chen@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]
On 6/7/23 4:14 PM, Justin Chen wrote:
> 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>
> ---
> v2
> - Return -EINVAL instead of -EOPNOTSUPP
>
> net/ethtool/ioctl.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
> index 6bb778e10461..37b582225854 100644
> --- a/net/ethtool/ioctl.c
> +++ b/net/ethtool/ioctl.c
> @@ -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;
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
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4206 bytes --]
next prev parent reply other threads:[~2023-06-09 20:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 23:14 [PATCH v2 net-next] ethtool: ioctl: improve error checking for set_wol Justin Chen
2023-06-08 16:01 ` Florian Fainelli
2023-06-09 2:40 ` patchwork-bot+netdevbpf
2023-06-09 20:47 ` Justin Chen [this message]
2023-06-10 6:18 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c512a8ee-cfc7-d0c8-6cf2-442da8dc1f1b@broadcom.com \
--to=justin.chen@broadcom.com \
--cc=andrew@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=d-tatianin@yandex-team.ru \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=gal@nvidia.com \
--cc=idosch@nvidia.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=marco@mebeim.net \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).