mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/sched: cls_flower: propagate tca[TCA_OPTIONS] to NL_REQ_ATTR_CHECK

Browse Source 
NL_REQ_ATTR_CHECK() is used in fl_set_key_flags() to set
extended attributes about the origin of an error, this
patch propagates tca[TCA_OPTIONS] through.

Before this patch:

$ sudo ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/tc.yaml \
	 --do newtfilter --json '{
		"chain": 0, "family": 0, "handle": 4, "ifindex": 22,
		"info": 262152,
		"kind": "flower",
		"options": {
			"flags": 0, "key-enc-flags": 8,
			"key-eth-type": 2048 },
		"parent": 4294967283 }'
Netlink error: Invalid argument
nl_len = 68 (52) nl_flags = 0x300 nl_type = 2
        error: -22
        extack: {'msg': 'Missing flags mask',
                 'miss-type': 111}

After this patch:

[same cmd]
Netlink error: Invalid argument
nl_len = 76 (60) nl_flags = 0x300 nl_type = 2
        error: -22
        extack: {'msg': 'Missing flags mask',
                 'miss-type': 111, 'miss-nest': 56}

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Link: https://patch.msgid.link/20240713021911.1631517-14-ast@fiberby.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Asbjørn Sloth Tønnesen 2024-07-13 02:19:10 +00:00 committed by Jakub Kicinski
parent 706bf4f44c
commit 536b97acdd
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/sched/cls_flower.c
View File

@ -1171,8 +1171,9 @@ static void fl_set_key_flag(u32 flower_key, u32 flower_mask,
} }
} }
static int fl_set_key_flags(struct nlattr **tb, bool encap, u32 *flags_key, static int fl_set_key_flags(struct nlattr *tca_opts, struct nlattr **tb,
u32 *flags_mask, struct netlink_ext_ack *extack) bool encap, u32 *flags_key, u32 *flags_mask,
struct netlink_ext_ack *extack)
{ {
int fl_key, fl_mask; int fl_key, fl_mask;
u32 key, mask; u32 key, mask;
@ -1186,7 +1187,7 @@ static int fl_set_key_flags(struct nlattr **tb, bool encap, u32 *flags_key,
} }
/* mask is mandatory for flags */ /* mask is mandatory for flags */
if (NL_REQ_ATTR_CHECK(extack, NULL, tb, fl_mask)) { if (NL_REQ_ATTR_CHECK(extack, tca_opts, tb, fl_mask)) {
NL_SET_ERR_MSG(extack, "Missing flags mask"); NL_SET_ERR_MSG(extack, "Missing flags mask");
return -EINVAL; return -EINVAL;
} }
@ -1865,9 +1866,9 @@ static int fl_set_key_cfm(struct nlattr **tb,
return 0; return 0;
} }
static int fl_set_key(struct net *net, struct nlattr **tb, static int fl_set_key(struct net *net, struct nlattr *tca_opts,
struct fl_flow_key *key, struct fl_flow_key *mask, struct nlattr **tb, struct fl_flow_key *key,
struct netlink_ext_ack *extack) struct fl_flow_key *mask, struct netlink_ext_ack *extack)
{ {
__be16 ethertype; __be16 ethertype;
int ret = 0; int ret = 0;
@ -2100,14 +2101,16 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
return ret; return ret;
if (tb[TCA_FLOWER_KEY_FLAGS]) { if (tb[TCA_FLOWER_KEY_FLAGS]) {
ret = fl_set_key_flags(tb, false, &key->control.flags, ret = fl_set_key_flags(tca_opts, tb, false,
&key->control.flags,
&mask->control.flags, extack); &mask->control.flags, extack);
if (ret) if (ret)
return ret; return ret;
} }
if (tb[TCA_FLOWER_KEY_ENC_FLAGS]) if (tb[TCA_FLOWER_KEY_ENC_FLAGS])
ret = fl_set_key_flags(tb, true, &key->enc_control.flags, ret = fl_set_key_flags(tca_opts, tb, true,
&key->enc_control.flags,
&mask->enc_control.flags, extack); &mask->enc_control.flags, extack);
return ret; return ret;
@ -2358,6 +2361,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
{ {
struct cls_fl_head *head = fl_head_dereference(tp); struct cls_fl_head *head = fl_head_dereference(tp);
bool rtnl_held = !(flags & TCA_ACT_FLAGS_NO_RTNL); bool rtnl_held = !(flags & TCA_ACT_FLAGS_NO_RTNL);
struct nlattr *tca_opts = tca[TCA_OPTIONS];
struct cls_fl_filter *fold = *arg; struct cls_fl_filter *fold = *arg;
bool bound_to_filter = false; bool bound_to_filter = false;
struct cls_fl_filter *fnew; struct cls_fl_filter *fnew;
@ -2366,7 +2370,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
bool in_ht; bool in_ht;
int err; int err;
if (!tca[TCA_OPTIONS]) { if (!tca_opts) {
err = -EINVAL; err = -EINVAL;
goto errout_fold; goto errout_fold;
} }
@ -2384,7 +2388,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
} }
err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX, err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX,
tca[TCA_OPTIONS], fl_policy, NULL); tca_opts, fl_policy, NULL);
if (err < 0) if (err < 0)
goto errout_tb; goto errout_tb;
@ -2460,7 +2464,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
bound_to_filter = true; bound_to_filter = true;
} }
err = fl_set_key(net, tb, &fnew->key, &mask->key, extack); err = fl_set_key(net, tca_opts, tb, &fnew->key, &mask->key, extack);
if (err) if (err)
goto unbind_filter; goto unbind_filter;
@ -2800,18 +2804,19 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain,
struct nlattr **tca, struct nlattr **tca,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct nlattr *tca_opts = tca[TCA_OPTIONS];
struct fl_flow_tmplt *tmplt; struct fl_flow_tmplt *tmplt;
struct nlattr **tb; struct nlattr **tb;
int err; int err;
if (!tca[TCA_OPTIONS]) if (!tca_opts)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
tb = kcalloc(TCA_FLOWER_MAX + 1, sizeof(struct nlattr *), GFP_KERNEL); tb = kcalloc(TCA_FLOWER_MAX + 1, sizeof(struct nlattr *), GFP_KERNEL);
if (!tb) if (!tb)
return ERR_PTR(-ENOBUFS); return ERR_PTR(-ENOBUFS);
err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX, err = nla_parse_nested_deprecated(tb, TCA_FLOWER_MAX,
tca[TCA_OPTIONS], fl_policy, NULL); tca_opts, fl_policy, NULL);
if (err) if (err)
goto errout_tb; goto errout_tb;
@ -2821,7 +2826,8 @@ static void *fl_tmplt_create(struct net *net, struct tcf_chain *chain,
goto errout_tb; goto errout_tb;
} }
tmplt->chain = chain; tmplt->chain = chain;
err = fl_set_key(net, tb, &tmplt->dummy_key, &tmplt->mask, extack); err = fl_set_key(net, tca_opts, tb, &tmplt->dummy_key,
&tmplt->mask, extack);
if (err) if (err)
goto errout_tmplt; goto errout_tmplt;