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

ethtool: Validate master slave configuration before rtnl_lock() 

Create a new function for input validations to be called before
rtnl_lock() and move the master slave validation to that function.

This would be a cleanup for next patch that would add another validation
to the new function.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>

 Conflicts:
	net/ethtool/linkmodes.c
This commit is contained in:
Danielle Ratson 2021-02-02 20:06:05 +02:00 committed by Jianping Liu
parent 39bc05fc7b
commit 6ad15a601f
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/ethtool/linkmodes.c
View File

@ -338,6 +338,21 @@ static bool ethnl_validate_master_slave_cfg(u8 cfg)
return false; return false;
} }
static int ethnl_check_linkmodes(struct genl_info *info, struct nlattr **tb)
{
const struct nlattr *master_slave_cfg;
master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];
if (master_slave_cfg &&
!ethnl_validate_master_slave_cfg(nla_get_u8(master_slave_cfg))) {
NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
"master/slave value is invalid");
return -EOPNOTSUPP;
}
return 0;
}
static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb, static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,
struct ethtool_link_ksettings *ksettings, struct ethtool_link_ksettings *ksettings,
bool *mod) bool *mod)
@ -349,19 +364,11 @@ static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,
master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG]; master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];
if (master_slave_cfg) { if (master_slave_cfg) {
u8 cfg = nla_get_u8(master_slave_cfg);
if (lsettings->master_slave_cfg == MASTER_SLAVE_CFG_UNSUPPORTED) { if (lsettings->master_slave_cfg == MASTER_SLAVE_CFG_UNSUPPORTED) {
NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg, NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
"master/slave configuration not supported by device"); "master/slave configuration not supported by device");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (!ethnl_validate_master_slave_cfg(cfg)) {
NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
"master/slave value is invalid");
return -EOPNOTSUPP;
}
} }
*mod = false; *mod = false;
@ -404,6 +411,11 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info)
info->extack); info->extack);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ethnl_check_linkmodes(info, tb);
if (ret < 0)
return ret;
ret = ethnl_parse_header_dev_get(&req_info, ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_LINKMODES_HEADER], tb[ETHTOOL_A_LINKMODES_HEADER],
genl_info_net(info), info->extack, genl_info_net(info), info->extack,