Skip to content

Commit

Permalink
ethtool: Validate master slave configuration before rtnl_lock()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Danielle Ratson authored and Jakub Kicinski committed Feb 4, 2021
1 parent 99b8202 commit 189e7a8
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions net/ethtool/linkmodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,21 @@ static bool ethnl_validate_master_slave_cfg(u8 cfg)
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,
struct ethtool_link_ksettings *ksettings,
bool *mod)
Expand All @@ -336,19 +351,11 @@ static int ethnl_update_linkmodes(struct genl_info *info, struct nlattr **tb,

master_slave_cfg = tb[ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG];
if (master_slave_cfg) {
u8 cfg = nla_get_u8(master_slave_cfg);

if (lsettings->master_slave_cfg == MASTER_SLAVE_CFG_UNSUPPORTED) {
NL_SET_ERR_MSG_ATTR(info->extack, master_slave_cfg,
"master/slave configuration not supported by device");
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;
Expand Down Expand Up @@ -386,6 +393,10 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info)
bool mod = false;
int ret;

ret = ethnl_check_linkmodes(info, tb);
if (ret < 0)
return ret;

ret = ethnl_parse_header_dev_get(&req_info,
tb[ETHTOOL_A_LINKMODES_HEADER],
genl_info_net(info), info->extack,
Expand Down

0 comments on commit 189e7a8

Please sign in to comment.