UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ethtool: fec: sanitize ethtool_fecparam->active_fec 

struct ethtool_fecparam::active_fec is a GET-only field,
all in-tree drivers correctly ignore it on SET. Clear
the field on SET to avoid any confusion. Again, we can't
reject non-zero now since ethtool user space does not
zero-init the param correctly.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
This commit is contained in:
Jakub Kicinski 2021-03-24 18:11:58 -07:00 committed by Jianping Liu
parent c72d2b916b
commit 7afa2e36c2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/ethtool.h
View File

@ -1376,7 +1376,7 @@ struct ethtool_per_queue_op {
/** /**
* struct ethtool_fecparam - Ethernet forward error correction(fec) parameters * struct ethtool_fecparam - Ethernet forward error correction(fec) parameters
* @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, GET only.
* @fec: Bitmask of supported/configured FEC modes * @fec: Bitmask of supported/configured FEC modes
* @reserved: Reserved for future extensions, ignore on GET, write 0 for SET. * @reserved: Reserved for future extensions, ignore on GET, write 0 for SET.
*/ */

1
net/ethtool/ioctl.c
View File

@ -2509,6 +2509,7 @@ 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.active_fec = 0;
fecparam.reserved = 0; fecparam.reserved = 0;
return dev->ethtool_ops->set_fecparam(dev, &fecparam); return dev->ethtool_ops->set_fecparam(dev, &fecparam);