Commit ff419afa authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethtool: trim policy tables 



Since ethtool uses strict attribute validation there's no need
to initialize all attributes in policy tables. 0 is NLA_UNSPEC
which is going to be rejected. Remove the NLA_REJECTs.

Similarly attributes above maxattrs are rejected, so there's
no need to always size the policy tables to ETHTOOL_A_..._MAX.

v2: - new patch

Suggested-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5028588b

net/ethtool/bitset.c

+12 −14
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ nla_put_failure: 
	return -EMSGSIZE;

}



static const struct nla_policy bitset_policy[ETHTOOL_A_BITSET_MAX + 1] = {

	[ETHTOOL_A_BITSET_UNSPEC]	= { .type = NLA_REJECT },

static const struct nla_policy bitset_policy[] = {

	[ETHTOOL_A_BITSET_NOMASK]	= { .type = NLA_FLAG },

	[ETHTOOL_A_BITSET_SIZE]		= NLA_POLICY_MAX(NLA_U32,

							 ETHNL_MAX_BITSET_SIZE),
@@ -312,8 +311,7 @@ static const struct nla_policy bitset_policy[ETHTOOL_A_BITSET_MAX + 1] = { 
	[ETHTOOL_A_BITSET_MASK]		= { .type = NLA_BINARY },

};



static const struct nla_policy bit_policy[ETHTOOL_A_BITSET_BIT_MAX + 1] = {

	[ETHTOOL_A_BITSET_BIT_UNSPEC]	= { .type = NLA_REJECT },

static const struct nla_policy bit_policy[] = {

	[ETHTOOL_A_BITSET_BIT_INDEX]	= { .type = NLA_U32 },

	[ETHTOOL_A_BITSET_BIT_NAME]	= { .type = NLA_NUL_STRING },

	[ETHTOOL_A_BITSET_BIT_VALUE]	= { .type = NLA_FLAG },
@@ -329,10 +327,10 @@ static const struct nla_policy bit_policy[ETHTOOL_A_BITSET_BIT_MAX + 1] = { 
 */

int ethnl_bitset_is_compact(const struct nlattr *bitset, bool *compact)

{

	struct nlattr *tb[ETHTOOL_A_BITSET_MAX + 1];

	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];

	int ret;



	ret = nla_parse_nested(tb, ETHTOOL_A_BITSET_MAX, bitset,

	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, bitset,

			       bitset_policy, NULL);

	if (ret < 0)

		return ret;
@@ -381,10 +379,10 @@ static int ethnl_parse_bit(unsigned int *index, bool *val, unsigned int nbits, 
			   ethnl_string_array_t names,

			   struct netlink_ext_ack *extack)

{

	struct nlattr *tb[ETHTOOL_A_BITSET_BIT_MAX + 1];

	struct nlattr *tb[ARRAY_SIZE(bit_policy)];

	int ret, idx;



	ret = nla_parse_nested(tb, ETHTOOL_A_BITSET_BIT_MAX, bit_attr,

	ret = nla_parse_nested(tb, ARRAY_SIZE(bit_policy) - 1, bit_attr,

			       bit_policy, extack);

	if (ret < 0)

		return ret;
@@ -555,15 +553,15 @@ int ethnl_update_bitset32(u32 *bitmap, unsigned int nbits, 
			  const struct nlattr *attr, ethnl_string_array_t names,

			  struct netlink_ext_ack *extack, bool *mod)

{

	struct nlattr *tb[ETHTOOL_A_BITSET_MAX + 1];

	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];

	unsigned int change_bits;

	bool no_mask;

	int ret;



	if (!attr)

		return 0;

	ret = nla_parse_nested(tb, ETHTOOL_A_BITSET_MAX, attr, bitset_policy,

			       extack);

	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,

			       bitset_policy, extack);

	if (ret < 0)

		return ret;
@@ -608,7 +606,7 @@ int ethnl_parse_bitset(unsigned long *val, unsigned long *mask, 
		       ethnl_string_array_t names,

		       struct netlink_ext_ack *extack)

{

	struct nlattr *tb[ETHTOOL_A_BITSET_MAX + 1];

	struct nlattr *tb[ARRAY_SIZE(bitset_policy)];

	const struct nlattr *bit_attr;

	bool no_mask;

	int rem;
@@ -616,8 +614,8 @@ int ethnl_parse_bitset(unsigned long *val, unsigned long *mask, 


	if (!attr)

		return 0;

	ret = nla_parse_nested(tb, ETHTOOL_A_BITSET_MAX, attr, bitset_policy,

			       extack);

	ret = nla_parse_nested(tb, ARRAY_SIZE(bitset_policy) - 1, attr,

			       bitset_policy, extack);

	if (ret < 0)

		return ret;

	no_mask = tb[ETHTOOL_A_BITSET_NOMASK];

net/ethtool/cabletest.c

+8 −11
Original line number Diff line number Diff line
@@ -11,9 +11,7 @@ 
 */

#define MAX_CABLE_LENGTH_CM (150 * 100)



const struct nla_policy

ethnl_cable_test_act_policy[ETHTOOL_A_CABLE_TEST_MAX + 1] = {

	[ETHTOOL_A_CABLE_TEST_UNSPEC]		= { .type = NLA_REJECT },

const struct nla_policy ethnl_cable_test_act_policy[] = {

	[ETHTOOL_A_CABLE_TEST_HEADER]		= { .type = NLA_NESTED },

};
@@ -212,17 +210,14 @@ struct cable_test_tdr_req_info { 
	struct ethnl_req_info		base;

};



static const struct nla_policy

cable_test_tdr_act_cfg_policy[ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX + 1] = {

static const struct nla_policy cable_test_tdr_act_cfg_policy[] = {

	[ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST]	= { .type = NLA_U32 },

	[ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST]	= { .type = NLA_U32 },

	[ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP]	= { .type = NLA_U32 },

	[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR]	= { .type = NLA_U8 },

};



const struct nla_policy

ethnl_cable_test_tdr_act_policy[ETHTOOL_A_CABLE_TEST_TDR_MAX + 1] = {

	[ETHTOOL_A_CABLE_TEST_TDR_UNSPEC]	= { .type = NLA_REJECT },

const struct nla_policy ethnl_cable_test_tdr_act_policy[] = {

	[ETHTOOL_A_CABLE_TEST_TDR_HEADER]	= { .type = NLA_NESTED },

	[ETHTOOL_A_CABLE_TEST_TDR_CFG]		= { .type = NLA_NESTED },

};
@@ -232,7 +227,7 @@ static int ethnl_act_cable_test_tdr_cfg(const struct nlattr *nest, 
					struct genl_info *info,

					struct phy_tdr_config *cfg)

{

	struct nlattr *tb[ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX + 1];

	struct nlattr *tb[ARRAY_SIZE(cable_test_tdr_act_cfg_policy)];

	int ret;



	cfg->first = 100;
@@ -243,8 +238,10 @@ static int ethnl_act_cable_test_tdr_cfg(const struct nlattr *nest, 
	if (!nest)

		return 0;



	ret = nla_parse_nested(tb, ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX, nest,

			       cable_test_tdr_act_cfg_policy, info->extack);

	ret = nla_parse_nested(tb,

			       ARRAY_SIZE(cable_test_tdr_act_cfg_policy) - 1,

			       nest, cable_test_tdr_act_cfg_policy,

			       info->extack);

	if (ret < 0)

		return ret;

net/ethtool/channels.c

+2 −18
Original line number Diff line number Diff line
@@ -17,18 +17,8 @@ struct channels_reply_data { 
#define CHANNELS_REPDATA(__reply_base) \

	container_of(__reply_base, struct channels_reply_data, base)



const struct nla_policy

ethnl_channels_get_policy[ETHTOOL_A_CHANNELS_MAX + 1] = {

	[ETHTOOL_A_CHANNELS_UNSPEC]		= { .type = NLA_REJECT },

const struct nla_policy ethnl_channels_get_policy[] = {

	[ETHTOOL_A_CHANNELS_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_CHANNELS_RX_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_TX_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_OTHER_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_COMBINED_MAX]	= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_RX_COUNT]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_TX_COUNT]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_OTHER_COUNT]	= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_COMBINED_COUNT]	= { .type = NLA_REJECT },

};



static int channels_prepare_data(const struct ethnl_req_info *req_base,
@@ -109,14 +99,8 @@ const struct ethnl_request_ops ethnl_channels_request_ops = { 


/* CHANNELS_SET */



const struct nla_policy

ethnl_channels_set_policy[ETHTOOL_A_CHANNELS_MAX + 1] = {

	[ETHTOOL_A_CHANNELS_UNSPEC]		= { .type = NLA_REJECT },

const struct nla_policy ethnl_channels_set_policy[] = {

	[ETHTOOL_A_CHANNELS_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_CHANNELS_RX_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_TX_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_OTHER_MAX]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_COMBINED_MAX]	= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_RX_COUNT]		= { .type = NLA_U32 },

	[ETHTOOL_A_CHANNELS_TX_COUNT]		= { .type = NLA_U32 },

	[ETHTOOL_A_CHANNELS_OTHER_COUNT]	= { .type = NLA_U32 },

net/ethtool/coalesce.c

+2 −28
Original line number Diff line number Diff line
@@ -51,32 +51,8 @@ __CHECK_SUPPORTED_OFFSET(COALESCE_TX_USECS_HIGH); 
__CHECK_SUPPORTED_OFFSET(COALESCE_TX_MAX_FRAMES_HIGH);

__CHECK_SUPPORTED_OFFSET(COALESCE_RATE_SAMPLE_INTERVAL);



const struct nla_policy

ethnl_coalesce_get_policy[ETHTOOL_A_COALESCE_MAX + 1] = {

	[ETHTOOL_A_COALESCE_UNSPEC]		= { .type = NLA_REJECT },

const struct nla_policy ethnl_coalesce_get_policy[] = {

	[ETHTOOL_A_COALESCE_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_COALESCE_RX_USECS]		= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_USECS_IRQ]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_USECS]		= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_USECS_IRQ]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_STATS_BLOCK_USECS]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_PKT_RATE_LOW]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_USECS_LOW]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_USECS_LOW]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_PKT_RATE_HIGH]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_USECS_HIGH]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_USECS_HIGH]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH]	= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL] = { .type = NLA_REJECT },

};



static int coalesce_prepare_data(const struct ethnl_req_info *req_base,
@@ -213,9 +189,7 @@ const struct ethnl_request_ops ethnl_coalesce_request_ops = { 


/* COALESCE_SET */



const struct nla_policy

ethnl_coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1] = {

	[ETHTOOL_A_COALESCE_UNSPEC]		= { .type = NLA_REJECT },

const struct nla_policy ethnl_coalesce_set_policy[] = {

	[ETHTOOL_A_COALESCE_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_COALESCE_RX_USECS]		= { .type = NLA_U32 },

	[ETHTOOL_A_COALESCE_RX_MAX_FRAMES]	= { .type = NLA_U32 },

net/ethtool/debug.c

+2 −5
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ struct debug_reply_data { 
#define DEBUG_REPDATA(__reply_base) \

	container_of(__reply_base, struct debug_reply_data, base)



const struct nla_policy ethnl_debug_get_policy[ETHTOOL_A_DEBUG_MAX + 1] = {

	[ETHTOOL_A_DEBUG_UNSPEC]	= { .type = NLA_REJECT },

const struct nla_policy ethnl_debug_get_policy[] = {

	[ETHTOOL_A_DEBUG_HEADER]	= { .type = NLA_NESTED },

	[ETHTOOL_A_DEBUG_MSGMASK]	= { .type = NLA_REJECT },

};



static int debug_prepare_data(const struct ethnl_req_info *req_base,
@@ -78,8 +76,7 @@ const struct ethnl_request_ops ethnl_debug_request_ops = { 


/* DEBUG_SET */



const struct nla_policy ethnl_debug_set_policy[ETHTOOL_A_DEBUG_MAX + 1] = {

	[ETHTOOL_A_DEBUG_UNSPEC]	= { .type = NLA_REJECT },

const struct nla_policy ethnl_debug_set_policy[] = {

	[ETHTOOL_A_DEBUG_HEADER]	= { .type = NLA_NESTED },

	[ETHTOOL_A_DEBUG_MSGMASK]	= { .type = NLA_NESTED },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE