Commit 240e1144 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

ethtool: fec: sanitize ethtool_fecparam->reserved

struct ethtool_fecparam::reserved is never looked at by the core.
Make sure it's actually 0. Unfortunately we can't return an error
because old ethtool doesn't zero-initialize the structure for SET.
On GET we can be more verbose, there are no in tree (ab)users.

Fix up the kdoc on the structure. Remove the mention of FEC
bypass. Seems like a niche thing to configure in the first
place.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40838681
...@@ -1380,7 +1380,7 @@ struct ethtool_per_queue_op { ...@@ -1380,7 +1380,7 @@ struct ethtool_per_queue_op {
* @cmd: Command number = %ETHTOOL_GFECPARAM or %ETHTOOL_SFECPARAM * @cmd: Command number = %ETHTOOL_GFECPARAM or %ETHTOOL_SFECPARAM
* @active_fec: FEC mode which is active on the port * @active_fec: FEC mode which is active on the port
* @fec: Bitmask of supported/configured FEC modes * @fec: Bitmask of supported/configured FEC modes
* @rsvd: Reserved for future extensions. i.e FEC bypass feature. * @reserved: Reserved for future extensions, ignore on GET, write 0 for SET.
*/ */
struct ethtool_fecparam { struct ethtool_fecparam {
__u32 cmd; __u32 cmd;
......
...@@ -2568,6 +2568,9 @@ static int ethtool_get_fecparam(struct net_device *dev, void __user *useraddr) ...@@ -2568,6 +2568,9 @@ static int ethtool_get_fecparam(struct net_device *dev, void __user *useraddr)
if (rc) if (rc)
return rc; return rc;
if (WARN_ON_ONCE(fecparam.reserved))
fecparam.reserved = 0;
if (copy_to_user(useraddr, &fecparam, sizeof(fecparam))) if (copy_to_user(useraddr, &fecparam, sizeof(fecparam)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -2583,6 +2586,8 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr) ...@@ -2583,6 +2586,8 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr)
if (copy_from_user(&fecparam, useraddr, sizeof(fecparam))) if (copy_from_user(&fecparam, useraddr, sizeof(fecparam)))
return -EFAULT; return -EFAULT;
fecparam.reserved = 0;
return dev->ethtool_ops->set_fecparam(dev, &fecparam); return dev->ethtool_ops->set_fecparam(dev, &fecparam);
} }
......
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