mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
8cb081746c
We currently have two levels of strict validation: 1) liberal (default) - undefined (type >= max) & NLA_UNSPEC attributes accepted - attribute length >= expected accepted - garbage at end of message accepted 2) strict (opt-in) - NLA_UNSPEC attributes accepted - attribute length >= expected accepted Split out parsing strictness into four different options: * TRAILING - check that there's no trailing data after parsing attributes (in message or nested) * MAXTYPE - reject attrs > max known type * UNSPEC - reject attributes with NLA_UNSPEC policy entries * STRICT_ATTRS - strictly validate attribute size The default for future things should be *everything*. The current *_strict() is a combination of TRAILING and MAXTYPE, and is renamed to _deprecated_strict(). The current regular parsing has none of this, and is renamed to *_parse_deprecated(). Additionally it allows us to selectively set one of the new flags even on old policies. Notably, the UNSPEC flag could be useful in this case, since it can be arranged (by filling in the policy) to not be an incompatible userspace ABI change, but would then going forward prevent forgetting attribute entries. Similar can apply to the POLICY flag. We end up with the following renames: * nla_parse -> nla_parse_deprecated * nla_parse_strict -> nla_parse_deprecated_strict * nlmsg_parse -> nlmsg_parse_deprecated * nlmsg_parse_strict -> nlmsg_parse_deprecated_strict * nla_parse_nested -> nla_parse_nested_deprecated * nla_validate_nested -> nla_validate_nested_deprecated Using spatch, of course: @@ expression TB, MAX, HEAD, LEN, POL, EXT; @@ -nla_parse(TB, MAX, HEAD, LEN, POL, EXT) +nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT) @@ expression NLH, HDRLEN, TB, MAX, POL, EXT; @@ -nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT) +nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT) @@ expression NLH, HDRLEN, TB, MAX, POL, EXT; @@ -nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT) +nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT) @@ expression TB, MAX, NLA, POL, EXT; @@ -nla_parse_nested(TB, MAX, NLA, POL, EXT) +nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT) @@ expression START, MAX, POL, EXT; @@ -nla_validate_nested(START, MAX, POL, EXT) +nla_validate_nested_deprecated(START, MAX, POL, EXT) @@ expression NLH, HDRLEN, MAX, POL, EXT; @@ -nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT) +nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT) For this patch, don't actually add the strict, non-renamed versions yet so that it breaks compile if I get it wrong. Also, while at it, make nla_validate and nla_parse go down to a common __nla_validate_parse() function to avoid code duplication. Ultimately, this allows us to have very strict validation for every new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the next patch, while existing things will continue to work as is. In effect then, this adds fully strict validation for any new command. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
272 lines
6.6 KiB
C
272 lines
6.6 KiB
C
/*
|
|
* net/sched/act_simple.c Simple example of an action
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Jamal Hadi Salim (2005-8)
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <net/netlink.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <net/pkt_cls.h>
|
|
|
|
#include <linux/tc_act/tc_defact.h>
|
|
#include <net/tc_act/tc_defact.h>
|
|
|
|
static unsigned int simp_net_id;
|
|
static struct tc_action_ops act_simp_ops;
|
|
|
|
#define SIMP_MAX_DATA 32
|
|
static int tcf_simp_act(struct sk_buff *skb, const struct tc_action *a,
|
|
struct tcf_result *res)
|
|
{
|
|
struct tcf_defact *d = to_defact(a);
|
|
|
|
spin_lock(&d->tcf_lock);
|
|
tcf_lastuse_update(&d->tcf_tm);
|
|
bstats_update(&d->tcf_bstats, skb);
|
|
|
|
/* print policy string followed by _ then packet count
|
|
* Example if this was the 3rd packet and the string was "hello"
|
|
* then it would look like "hello_3" (without quotes)
|
|
*/
|
|
pr_info("simple: %s_%d\n",
|
|
(char *)d->tcfd_defdata, d->tcf_bstats.packets);
|
|
spin_unlock(&d->tcf_lock);
|
|
return d->tcf_action;
|
|
}
|
|
|
|
static void tcf_simp_release(struct tc_action *a)
|
|
{
|
|
struct tcf_defact *d = to_defact(a);
|
|
kfree(d->tcfd_defdata);
|
|
}
|
|
|
|
static int alloc_defdata(struct tcf_defact *d, const struct nlattr *defdata)
|
|
{
|
|
d->tcfd_defdata = kzalloc(SIMP_MAX_DATA, GFP_KERNEL);
|
|
if (unlikely(!d->tcfd_defdata))
|
|
return -ENOMEM;
|
|
nla_strlcpy(d->tcfd_defdata, defdata, SIMP_MAX_DATA);
|
|
return 0;
|
|
}
|
|
|
|
static int reset_policy(struct tc_action *a, const struct nlattr *defdata,
|
|
struct tc_defact *p, struct tcf_proto *tp,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tcf_chain *goto_ch = NULL;
|
|
struct tcf_defact *d;
|
|
int err;
|
|
|
|
err = tcf_action_check_ctrlact(p->action, tp, &goto_ch, extack);
|
|
if (err < 0)
|
|
return err;
|
|
d = to_defact(a);
|
|
spin_lock_bh(&d->tcf_lock);
|
|
goto_ch = tcf_action_set_ctrlact(a, p->action, goto_ch);
|
|
memset(d->tcfd_defdata, 0, SIMP_MAX_DATA);
|
|
nla_strlcpy(d->tcfd_defdata, defdata, SIMP_MAX_DATA);
|
|
spin_unlock_bh(&d->tcf_lock);
|
|
if (goto_ch)
|
|
tcf_chain_put_by_act(goto_ch);
|
|
return 0;
|
|
}
|
|
|
|
static const struct nla_policy simple_policy[TCA_DEF_MAX + 1] = {
|
|
[TCA_DEF_PARMS] = { .len = sizeof(struct tc_defact) },
|
|
[TCA_DEF_DATA] = { .type = NLA_STRING, .len = SIMP_MAX_DATA },
|
|
};
|
|
|
|
static int tcf_simp_init(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, struct tc_action **a,
|
|
int ovr, int bind, bool rtnl_held,
|
|
struct tcf_proto *tp, struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, simp_net_id);
|
|
struct nlattr *tb[TCA_DEF_MAX + 1];
|
|
struct tcf_chain *goto_ch = NULL;
|
|
struct tc_defact *parm;
|
|
struct tcf_defact *d;
|
|
bool exists = false;
|
|
int ret = 0, err;
|
|
|
|
if (nla == NULL)
|
|
return -EINVAL;
|
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_DEF_MAX, nla, simple_policy,
|
|
NULL);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (tb[TCA_DEF_PARMS] == NULL)
|
|
return -EINVAL;
|
|
|
|
parm = nla_data(tb[TCA_DEF_PARMS]);
|
|
err = tcf_idr_check_alloc(tn, &parm->index, a, bind);
|
|
if (err < 0)
|
|
return err;
|
|
exists = err;
|
|
if (exists && bind)
|
|
return 0;
|
|
|
|
if (tb[TCA_DEF_DATA] == NULL) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (!exists) {
|
|
ret = tcf_idr_create(tn, parm->index, est, a,
|
|
&act_simp_ops, bind, false);
|
|
if (ret) {
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return ret;
|
|
}
|
|
|
|
d = to_defact(*a);
|
|
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch,
|
|
extack);
|
|
if (err < 0)
|
|
goto release_idr;
|
|
|
|
err = alloc_defdata(d, tb[TCA_DEF_DATA]);
|
|
if (err < 0)
|
|
goto put_chain;
|
|
|
|
tcf_action_set_ctrlact(*a, parm->action, goto_ch);
|
|
ret = ACT_P_CREATED;
|
|
} else {
|
|
if (!ovr) {
|
|
err = -EEXIST;
|
|
goto release_idr;
|
|
}
|
|
|
|
err = reset_policy(*a, tb[TCA_DEF_DATA], parm, tp, extack);
|
|
if (err)
|
|
goto release_idr;
|
|
}
|
|
|
|
if (ret == ACT_P_CREATED)
|
|
tcf_idr_insert(tn, *a);
|
|
return ret;
|
|
put_chain:
|
|
if (goto_ch)
|
|
tcf_chain_put_by_act(goto_ch);
|
|
release_idr:
|
|
tcf_idr_release(*a, bind);
|
|
return err;
|
|
}
|
|
|
|
static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
|
|
int bind, int ref)
|
|
{
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
struct tcf_defact *d = to_defact(a);
|
|
struct tc_defact opt = {
|
|
.index = d->tcf_index,
|
|
.refcnt = refcount_read(&d->tcf_refcnt) - ref,
|
|
.bindcnt = atomic_read(&d->tcf_bindcnt) - bind,
|
|
};
|
|
struct tcf_t t;
|
|
|
|
spin_lock_bh(&d->tcf_lock);
|
|
opt.action = d->tcf_action;
|
|
if (nla_put(skb, TCA_DEF_PARMS, sizeof(opt), &opt) ||
|
|
nla_put_string(skb, TCA_DEF_DATA, d->tcfd_defdata))
|
|
goto nla_put_failure;
|
|
|
|
tcf_tm_dump(&t, &d->tcf_tm);
|
|
if (nla_put_64bit(skb, TCA_DEF_TM, sizeof(t), &t, TCA_DEF_PAD))
|
|
goto nla_put_failure;
|
|
spin_unlock_bh(&d->tcf_lock);
|
|
|
|
return skb->len;
|
|
|
|
nla_put_failure:
|
|
spin_unlock_bh(&d->tcf_lock);
|
|
nlmsg_trim(skb, b);
|
|
return -1;
|
|
}
|
|
|
|
static int tcf_simp_walker(struct net *net, struct sk_buff *skb,
|
|
struct netlink_callback *cb, int type,
|
|
const struct tc_action_ops *ops,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, simp_net_id);
|
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
|
}
|
|
|
|
static int tcf_simp_search(struct net *net, struct tc_action **a, u32 index)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, simp_net_id);
|
|
|
|
return tcf_idr_search(tn, a, index);
|
|
}
|
|
|
|
static struct tc_action_ops act_simp_ops = {
|
|
.kind = "simple",
|
|
.id = TCA_ID_SIMP,
|
|
.owner = THIS_MODULE,
|
|
.act = tcf_simp_act,
|
|
.dump = tcf_simp_dump,
|
|
.cleanup = tcf_simp_release,
|
|
.init = tcf_simp_init,
|
|
.walk = tcf_simp_walker,
|
|
.lookup = tcf_simp_search,
|
|
.size = sizeof(struct tcf_defact),
|
|
};
|
|
|
|
static __net_init int simp_init_net(struct net *net)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, simp_net_id);
|
|
|
|
return tc_action_net_init(tn, &act_simp_ops);
|
|
}
|
|
|
|
static void __net_exit simp_exit_net(struct list_head *net_list)
|
|
{
|
|
tc_action_net_exit(net_list, simp_net_id);
|
|
}
|
|
|
|
static struct pernet_operations simp_net_ops = {
|
|
.init = simp_init_net,
|
|
.exit_batch = simp_exit_net,
|
|
.id = &simp_net_id,
|
|
.size = sizeof(struct tc_action_net),
|
|
};
|
|
|
|
MODULE_AUTHOR("Jamal Hadi Salim(2005)");
|
|
MODULE_DESCRIPTION("Simple example action");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static int __init simp_init_module(void)
|
|
{
|
|
int ret = tcf_register_action(&act_simp_ops, &simp_net_ops);
|
|
if (!ret)
|
|
pr_info("Simple TC action Loaded\n");
|
|
return ret;
|
|
}
|
|
|
|
static void __exit simp_cleanup_module(void)
|
|
{
|
|
tcf_unregister_action(&act_simp_ops, &simp_net_ops);
|
|
}
|
|
|
|
module_init(simp_init_module);
|
|
module_exit(simp_cleanup_module);
|