forked from luck/tmp_suning_uos_patched
ec7727bb24
the following script: # tc qdisc add dev crash0 clsact # tc filter add dev crash0 egress matchall \ > action skbedit ptype host pass index 90 # tc actions replace action skbedit \ > ptype host goto chain 42 index 90 cookie c1a0c1a0 # tc actions show action skbedit had the following output: Error: Failed to init TC action chain. We have an error talking to the kernel total acts 1 action order 0: skbedit ptype host goto chain 42 index 90 ref 2 bind 1 cookie c1a0c1a0 Then, the first packet transmitted by crash0 made the kernel crash: BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 #PF error: [normal kernel read fault] PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 3 PID: 3467 Comm: kworker/3:3 Not tainted 5.0.0-rc4.gotochain_crash+ #536 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 Workqueue: ipv6_addrconf addrconf_dad_work RIP: 0010:tcf_action_exec+0xb8/0x100 Code: 00 00 00 20 74 1d 83 f8 03 75 09 49 83 c4 08 4d 39 ec 75 bc 48 83 c4 10 5b 5d 41 5c 41 5d 41 5e 41 5f c3 49 8b 97 a8 00 00 00 <48> 8b 12 48 89 55 00 48 83 c4 10 5b 5d 41 5c 41 5d 41 5e 41 5f c3 RSP: 0018:ffffb50a81e1fad0 EFLAGS: 00010246 RAX: 000000002000002a RBX: ffff9aa47ba4ea00 RCX: 0000000000000001 RDX: 0000000000000000 RSI: ffff9aa469eeb3c0 RDI: ffff9aa47ba4ea00 RBP: ffffb50a81e1fb70 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: ffff9aa47bce0638 R12: ffff9aa4793b0c00 R13: ffff9aa4793b0c08 R14: 0000000000000001 R15: ffff9aa469eeb3c0 FS: 0000000000000000(0000) GS:ffff9aa474780000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000007360e005 CR4: 00000000001606e0 Call Trace: tcf_classify+0x58/0x120 __dev_queue_xmit+0x40a/0x890 ? ndisc_next_option+0x50/0x50 ? ___neigh_create+0x4d5/0x680 ? ip6_finish_output2+0x1b5/0x590 ip6_finish_output2+0x1b5/0x590 ? ip6_output+0x68/0x110 ip6_output+0x68/0x110 ? nf_hook.constprop.28+0x79/0xc0 ndisc_send_skb+0x248/0x2e0 ndisc_send_ns+0xf8/0x200 ? addrconf_dad_work+0x389/0x4b0 addrconf_dad_work+0x389/0x4b0 ? __switch_to_asm+0x34/0x70 ? process_one_work+0x195/0x380 ? addrconf_dad_completed+0x370/0x370 process_one_work+0x195/0x380 worker_thread+0x30/0x390 ? process_one_work+0x380/0x380 kthread+0x113/0x130 ? kthread_park+0x90/0x90 ret_from_fork+0x35/0x40 Modules linked in: act_skbedit veth ip6table_filter ip6_tables iptable_filter binfmt_misc crct10dif_pclmul crc32_pclmul ghash_clmulni_intel ext4 snd_hda_codec_generic snd_hda_intel snd_hda_codec snd_hwdep mbcache snd_hda_core jbd2 snd_seq snd_seq_device snd_pcm aesni_intel crypto_simd cryptd snd_timer glue_helper snd joydev soundcore pcspkr virtio_balloon i2c_piix4 nfsd auth_rpcgss nfs_acl lockd grace sunrpc ip_tables xfs ata_generic pata_acpi qxl drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm virtio_net net_failover drm failover virtio_blk virtio_console ata_piix virtio_pci crc32c_intel serio_raw libata virtio_ring virtio floppy dm_mirror dm_region_hash dm_log dm_mod CR2: 0000000000000000 Validating the control action within tcf_skbedit_init() proved to fix the above issue. A TDC selftest is added to verify the correct behavior. Fixes:db50514f9a
("net: sched: add termination action to allow goto chain") Fixes:97763dc0f4
("net_sched: reject unknown tcfa_action values") Signed-off-by: Davide Caratti <dcaratti@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
367 lines
9.8 KiB
C
367 lines
9.8 KiB
C
/*
|
|
* Copyright (c) 2008, Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Alexander Duyck <alexander.h.duyck@intel.com>
|
|
*/
|
|
|
|
#include <linux/module.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/ip.h>
|
|
#include <net/ipv6.h>
|
|
#include <net/dsfield.h>
|
|
#include <net/pkt_cls.h>
|
|
|
|
#include <linux/tc_act/tc_skbedit.h>
|
|
#include <net/tc_act/tc_skbedit.h>
|
|
|
|
static unsigned int skbedit_net_id;
|
|
static struct tc_action_ops act_skbedit_ops;
|
|
|
|
static int tcf_skbedit_act(struct sk_buff *skb, const struct tc_action *a,
|
|
struct tcf_result *res)
|
|
{
|
|
struct tcf_skbedit *d = to_skbedit(a);
|
|
struct tcf_skbedit_params *params;
|
|
int action;
|
|
|
|
tcf_lastuse_update(&d->tcf_tm);
|
|
bstats_cpu_update(this_cpu_ptr(d->common.cpu_bstats), skb);
|
|
|
|
params = rcu_dereference_bh(d->params);
|
|
action = READ_ONCE(d->tcf_action);
|
|
|
|
if (params->flags & SKBEDIT_F_PRIORITY)
|
|
skb->priority = params->priority;
|
|
if (params->flags & SKBEDIT_F_INHERITDSFIELD) {
|
|
int wlen = skb_network_offset(skb);
|
|
|
|
switch (tc_skb_protocol(skb)) {
|
|
case htons(ETH_P_IP):
|
|
wlen += sizeof(struct iphdr);
|
|
if (!pskb_may_pull(skb, wlen))
|
|
goto err;
|
|
skb->priority = ipv4_get_dsfield(ip_hdr(skb)) >> 2;
|
|
break;
|
|
|
|
case htons(ETH_P_IPV6):
|
|
wlen += sizeof(struct ipv6hdr);
|
|
if (!pskb_may_pull(skb, wlen))
|
|
goto err;
|
|
skb->priority = ipv6_get_dsfield(ipv6_hdr(skb)) >> 2;
|
|
break;
|
|
}
|
|
}
|
|
if (params->flags & SKBEDIT_F_QUEUE_MAPPING &&
|
|
skb->dev->real_num_tx_queues > params->queue_mapping)
|
|
skb_set_queue_mapping(skb, params->queue_mapping);
|
|
if (params->flags & SKBEDIT_F_MARK) {
|
|
skb->mark &= ~params->mask;
|
|
skb->mark |= params->mark & params->mask;
|
|
}
|
|
if (params->flags & SKBEDIT_F_PTYPE)
|
|
skb->pkt_type = params->ptype;
|
|
return action;
|
|
|
|
err:
|
|
qstats_drop_inc(this_cpu_ptr(d->common.cpu_qstats));
|
|
return TC_ACT_SHOT;
|
|
}
|
|
|
|
static const struct nla_policy skbedit_policy[TCA_SKBEDIT_MAX + 1] = {
|
|
[TCA_SKBEDIT_PARMS] = { .len = sizeof(struct tc_skbedit) },
|
|
[TCA_SKBEDIT_PRIORITY] = { .len = sizeof(u32) },
|
|
[TCA_SKBEDIT_QUEUE_MAPPING] = { .len = sizeof(u16) },
|
|
[TCA_SKBEDIT_MARK] = { .len = sizeof(u32) },
|
|
[TCA_SKBEDIT_PTYPE] = { .len = sizeof(u16) },
|
|
[TCA_SKBEDIT_MASK] = { .len = sizeof(u32) },
|
|
[TCA_SKBEDIT_FLAGS] = { .len = sizeof(u64) },
|
|
};
|
|
|
|
static int tcf_skbedit_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, skbedit_net_id);
|
|
struct tcf_skbedit_params *params_new;
|
|
struct nlattr *tb[TCA_SKBEDIT_MAX + 1];
|
|
struct tcf_chain *goto_ch = NULL;
|
|
struct tc_skbedit *parm;
|
|
struct tcf_skbedit *d;
|
|
u32 flags = 0, *priority = NULL, *mark = NULL, *mask = NULL;
|
|
u16 *queue_mapping = NULL, *ptype = NULL;
|
|
bool exists = false;
|
|
int ret = 0, err;
|
|
|
|
if (nla == NULL)
|
|
return -EINVAL;
|
|
|
|
err = nla_parse_nested(tb, TCA_SKBEDIT_MAX, nla, skbedit_policy, NULL);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (tb[TCA_SKBEDIT_PARMS] == NULL)
|
|
return -EINVAL;
|
|
|
|
if (tb[TCA_SKBEDIT_PRIORITY] != NULL) {
|
|
flags |= SKBEDIT_F_PRIORITY;
|
|
priority = nla_data(tb[TCA_SKBEDIT_PRIORITY]);
|
|
}
|
|
|
|
if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) {
|
|
flags |= SKBEDIT_F_QUEUE_MAPPING;
|
|
queue_mapping = nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING]);
|
|
}
|
|
|
|
if (tb[TCA_SKBEDIT_PTYPE] != NULL) {
|
|
ptype = nla_data(tb[TCA_SKBEDIT_PTYPE]);
|
|
if (!skb_pkt_type_ok(*ptype))
|
|
return -EINVAL;
|
|
flags |= SKBEDIT_F_PTYPE;
|
|
}
|
|
|
|
if (tb[TCA_SKBEDIT_MARK] != NULL) {
|
|
flags |= SKBEDIT_F_MARK;
|
|
mark = nla_data(tb[TCA_SKBEDIT_MARK]);
|
|
}
|
|
|
|
if (tb[TCA_SKBEDIT_MASK] != NULL) {
|
|
flags |= SKBEDIT_F_MASK;
|
|
mask = nla_data(tb[TCA_SKBEDIT_MASK]);
|
|
}
|
|
|
|
if (tb[TCA_SKBEDIT_FLAGS] != NULL) {
|
|
u64 *pure_flags = nla_data(tb[TCA_SKBEDIT_FLAGS]);
|
|
|
|
if (*pure_flags & SKBEDIT_F_INHERITDSFIELD)
|
|
flags |= SKBEDIT_F_INHERITDSFIELD;
|
|
}
|
|
|
|
parm = nla_data(tb[TCA_SKBEDIT_PARMS]);
|
|
|
|
err = tcf_idr_check_alloc(tn, &parm->index, a, bind);
|
|
if (err < 0)
|
|
return err;
|
|
exists = err;
|
|
if (exists && bind)
|
|
return 0;
|
|
|
|
if (!flags) {
|
|
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_skbedit_ops, bind, true);
|
|
if (ret) {
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return ret;
|
|
}
|
|
|
|
d = to_skbedit(*a);
|
|
ret = ACT_P_CREATED;
|
|
} else {
|
|
d = to_skbedit(*a);
|
|
if (!ovr) {
|
|
tcf_idr_release(*a, bind);
|
|
return -EEXIST;
|
|
}
|
|
}
|
|
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
|
|
if (err < 0)
|
|
goto release_idr;
|
|
|
|
params_new = kzalloc(sizeof(*params_new), GFP_KERNEL);
|
|
if (unlikely(!params_new)) {
|
|
err = -ENOMEM;
|
|
goto put_chain;
|
|
}
|
|
|
|
params_new->flags = flags;
|
|
if (flags & SKBEDIT_F_PRIORITY)
|
|
params_new->priority = *priority;
|
|
if (flags & SKBEDIT_F_QUEUE_MAPPING)
|
|
params_new->queue_mapping = *queue_mapping;
|
|
if (flags & SKBEDIT_F_MARK)
|
|
params_new->mark = *mark;
|
|
if (flags & SKBEDIT_F_PTYPE)
|
|
params_new->ptype = *ptype;
|
|
/* default behaviour is to use all the bits */
|
|
params_new->mask = 0xffffffff;
|
|
if (flags & SKBEDIT_F_MASK)
|
|
params_new->mask = *mask;
|
|
|
|
spin_lock_bh(&d->tcf_lock);
|
|
goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
|
|
rcu_swap_protected(d->params, params_new,
|
|
lockdep_is_held(&d->tcf_lock));
|
|
spin_unlock_bh(&d->tcf_lock);
|
|
if (params_new)
|
|
kfree_rcu(params_new, rcu);
|
|
if (goto_ch)
|
|
tcf_chain_put_by_act(goto_ch);
|
|
|
|
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_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
|
|
int bind, int ref)
|
|
{
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
struct tcf_skbedit *d = to_skbedit(a);
|
|
struct tcf_skbedit_params *params;
|
|
struct tc_skbedit opt = {
|
|
.index = d->tcf_index,
|
|
.refcnt = refcount_read(&d->tcf_refcnt) - ref,
|
|
.bindcnt = atomic_read(&d->tcf_bindcnt) - bind,
|
|
};
|
|
u64 pure_flags = 0;
|
|
struct tcf_t t;
|
|
|
|
spin_lock_bh(&d->tcf_lock);
|
|
params = rcu_dereference_protected(d->params,
|
|
lockdep_is_held(&d->tcf_lock));
|
|
opt.action = d->tcf_action;
|
|
|
|
if (nla_put(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt))
|
|
goto nla_put_failure;
|
|
if ((params->flags & SKBEDIT_F_PRIORITY) &&
|
|
nla_put_u32(skb, TCA_SKBEDIT_PRIORITY, params->priority))
|
|
goto nla_put_failure;
|
|
if ((params->flags & SKBEDIT_F_QUEUE_MAPPING) &&
|
|
nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING, params->queue_mapping))
|
|
goto nla_put_failure;
|
|
if ((params->flags & SKBEDIT_F_MARK) &&
|
|
nla_put_u32(skb, TCA_SKBEDIT_MARK, params->mark))
|
|
goto nla_put_failure;
|
|
if ((params->flags & SKBEDIT_F_PTYPE) &&
|
|
nla_put_u16(skb, TCA_SKBEDIT_PTYPE, params->ptype))
|
|
goto nla_put_failure;
|
|
if ((params->flags & SKBEDIT_F_MASK) &&
|
|
nla_put_u32(skb, TCA_SKBEDIT_MASK, params->mask))
|
|
goto nla_put_failure;
|
|
if (params->flags & SKBEDIT_F_INHERITDSFIELD)
|
|
pure_flags |= SKBEDIT_F_INHERITDSFIELD;
|
|
if (pure_flags != 0 &&
|
|
nla_put(skb, TCA_SKBEDIT_FLAGS, sizeof(pure_flags), &pure_flags))
|
|
goto nla_put_failure;
|
|
|
|
tcf_tm_dump(&t, &d->tcf_tm);
|
|
if (nla_put_64bit(skb, TCA_SKBEDIT_TM, sizeof(t), &t, TCA_SKBEDIT_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 void tcf_skbedit_cleanup(struct tc_action *a)
|
|
{
|
|
struct tcf_skbedit *d = to_skbedit(a);
|
|
struct tcf_skbedit_params *params;
|
|
|
|
params = rcu_dereference_protected(d->params, 1);
|
|
if (params)
|
|
kfree_rcu(params, rcu);
|
|
}
|
|
|
|
static int tcf_skbedit_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, skbedit_net_id);
|
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
|
}
|
|
|
|
static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
return tcf_idr_search(tn, a, index);
|
|
}
|
|
|
|
static struct tc_action_ops act_skbedit_ops = {
|
|
.kind = "skbedit",
|
|
.id = TCA_ID_SKBEDIT,
|
|
.owner = THIS_MODULE,
|
|
.act = tcf_skbedit_act,
|
|
.dump = tcf_skbedit_dump,
|
|
.init = tcf_skbedit_init,
|
|
.cleanup = tcf_skbedit_cleanup,
|
|
.walk = tcf_skbedit_walker,
|
|
.lookup = tcf_skbedit_search,
|
|
.size = sizeof(struct tcf_skbedit),
|
|
};
|
|
|
|
static __net_init int skbedit_init_net(struct net *net)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
return tc_action_net_init(tn, &act_skbedit_ops);
|
|
}
|
|
|
|
static void __net_exit skbedit_exit_net(struct list_head *net_list)
|
|
{
|
|
tc_action_net_exit(net_list, skbedit_net_id);
|
|
}
|
|
|
|
static struct pernet_operations skbedit_net_ops = {
|
|
.init = skbedit_init_net,
|
|
.exit_batch = skbedit_exit_net,
|
|
.id = &skbedit_net_id,
|
|
.size = sizeof(struct tc_action_net),
|
|
};
|
|
|
|
MODULE_AUTHOR("Alexander Duyck, <alexander.h.duyck@intel.com>");
|
|
MODULE_DESCRIPTION("SKB Editing");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static int __init skbedit_init_module(void)
|
|
{
|
|
return tcf_register_action(&act_skbedit_ops, &skbedit_net_ops);
|
|
}
|
|
|
|
static void __exit skbedit_cleanup_module(void)
|
|
{
|
|
tcf_unregister_action(&act_skbedit_ops, &skbedit_net_ops);
|
|
}
|
|
|
|
module_init(skbedit_init_module);
|
|
module_exit(skbedit_cleanup_module);
|