ethtool: strset: allow ETHTOOL_A_STRSET_COUNTS_ONLY attr (db972e53) · Commits · 戴 / test

The ETHTOOL_A_STRSET_COUNTS_ONLY flag attribute was previously not allowed to be used, but now due to the policy size reduction we would access the tb[] array out of bounds since we tried to check for the attribute despite it not being accepted. Fix both issues by adding it correctly to the appropriate policy. Fixes: ("ethtool: trim policy tables") Fixes: ("ethtool: provide string sets with STRSET_GET request") Reported-by:

Leon Romanovsky <leon@kernel.org> Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Tested-by:

Leon Romanovsky <leonro@nvidia.com> Reviewed-by:

Jakub Kicinski <kuba@kernel.org> Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

net/ethtool/netlink.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ extern const struct ethnl_request_ops ethnl_tsinfo_request_ops;

		extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1];
		extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1];
		extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_STRINGSETS + 1];
		extern const struct nla_policy ethnl_strset_get_policy[ETHTOOL_A_STRSET_COUNTS_ONLY + 1];
		extern const struct nla_policy ethnl_linkinfo_get_policy[ETHTOOL_A_LINKINFO_HEADER + 1];
		extern const struct nla_policy ethnl_linkinfo_set_policy[ETHTOOL_A_LINKINFO_TP_MDIX_CTRL + 1];
		extern const struct nla_policy ethnl_linkmodes_get_policy[ETHTOOL_A_LINKMODES_HEADER + 1];

net/ethtool/strset.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ const struct nla_policy ethnl_strset_get_policy[] = {
		[ETHTOOL_A_STRSET_HEADER] =
		NLA_POLICY_NESTED(ethnl_header_policy),
		[ETHTOOL_A_STRSET_STRINGSETS] = { .type = NLA_NESTED },
		[ETHTOOL_A_STRSET_COUNTS_ONLY] = { .type = NLA_FLAG },
		};

		static const struct nla_policy get_stringset_policy[] = {

Admin message