mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
396d7f23ad
When police action is created by cls API tcf_exts_validate() first
conditional that calls tcf_action_init_1() directly, the action idr is not
updated according to latest changes in action API that require caller to
commit newly created action to idr with tcf_idr_insert_many(). This results
such action not being accessible through act API and causes crash reported
by syzbot:
==================================================================
BUG: KASAN: null-ptr-deref in instrument_atomic_read include/linux/instrumented.h:71 [inline]
BUG: KASAN: null-ptr-deref in atomic_read include/asm-generic/atomic-instrumented.h:27 [inline]
BUG: KASAN: null-ptr-deref in __tcf_idr_release net/sched/act_api.c:178 [inline]
BUG: KASAN: null-ptr-deref in tcf_idrinfo_destroy+0x129/0x1d0 net/sched/act_api.c:598
Read of size 4 at addr 0000000000000010 by task kworker/u4:5/204
CPU: 0 PID: 204 Comm: kworker/u4:5 Not tainted 5.11.0-rc7-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: netns cleanup_net
Call Trace:
__dump_stack lib/dump_stack.c:79 [inline]
dump_stack+0x107/0x163 lib/dump_stack.c:120
__kasan_report mm/kasan/report.c:400 [inline]
kasan_report.cold+0x5f/0xd5 mm/kasan/report.c:413
check_memory_region_inline mm/kasan/generic.c:179 [inline]
check_memory_region+0x13d/0x180 mm/kasan/generic.c:185
instrument_atomic_read include/linux/instrumented.h:71 [inline]
atomic_read include/asm-generic/atomic-instrumented.h:27 [inline]
__tcf_idr_release net/sched/act_api.c:178 [inline]
tcf_idrinfo_destroy+0x129/0x1d0 net/sched/act_api.c:598
tc_action_net_exit include/net/act_api.h:151 [inline]
police_exit_net+0x168/0x360 net/sched/act_police.c:390
ops_exit_list+0x10d/0x160 net/core/net_namespace.c:190
cleanup_net+0x4ea/0xb10 net/core/net_namespace.c:604
process_one_work+0x98d/0x15f0 kernel/workqueue.c:2275
worker_thread+0x64c/0x1120 kernel/workqueue.c:2421
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:296
==================================================================
Kernel panic - not syncing: panic_on_warn set ...
CPU: 0 PID: 204 Comm: kworker/u4:5 Tainted: G B 5.11.0-rc7-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: netns cleanup_net
Call Trace:
__dump_stack lib/dump_stack.c:79 [inline]
dump_stack+0x107/0x163 lib/dump_stack.c:120
panic+0x306/0x73d kernel/panic.c:231
end_report+0x58/0x5e mm/kasan/report.c:100
__kasan_report mm/kasan/report.c:403 [inline]
kasan_report.cold+0x67/0xd5 mm/kasan/report.c:413
check_memory_region_inline mm/kasan/generic.c:179 [inline]
check_memory_region+0x13d/0x180 mm/kasan/generic.c:185
instrument_atomic_read include/linux/instrumented.h:71 [inline]
atomic_read include/asm-generic/atomic-instrumented.h:27 [inline]
__tcf_idr_release net/sched/act_api.c:178 [inline]
tcf_idrinfo_destroy+0x129/0x1d0 net/sched/act_api.c:598
tc_action_net_exit include/net/act_api.h:151 [inline]
police_exit_net+0x168/0x360 net/sched/act_police.c:390
ops_exit_list+0x10d/0x160 net/core/net_namespace.c:190
cleanup_net+0x4ea/0xb10 net/core/net_namespace.c:604
process_one_work+0x98d/0x15f0 kernel/workqueue.c:2275
worker_thread+0x64c/0x1120 kernel/workqueue.c:2421
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:296
Kernel Offset: disabled
Fix the issue by calling tcf_idr_insert_many() after successful action
initialization.
Fixes: 0fedc63fad
("net_sched: commit action insertions together")
Reported-by: syzbot+151e3e714d34ae4ce7e8@syzkaller.appspotmail.com
Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
265 lines
8.1 KiB
C
265 lines
8.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __NET_ACT_API_H
|
|
#define __NET_ACT_API_H
|
|
|
|
/*
|
|
* Public action API for classifiers/qdiscs
|
|
*/
|
|
|
|
#include <linux/refcount.h>
|
|
#include <net/sch_generic.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/netns/generic.h>
|
|
|
|
struct tcf_idrinfo {
|
|
struct mutex lock;
|
|
struct idr action_idr;
|
|
struct net *net;
|
|
};
|
|
|
|
struct tc_action_ops;
|
|
|
|
struct tc_action {
|
|
const struct tc_action_ops *ops;
|
|
__u32 type; /* for backward compat(TCA_OLD_COMPAT) */
|
|
struct tcf_idrinfo *idrinfo;
|
|
|
|
u32 tcfa_index;
|
|
refcount_t tcfa_refcnt;
|
|
atomic_t tcfa_bindcnt;
|
|
int tcfa_action;
|
|
struct tcf_t tcfa_tm;
|
|
struct gnet_stats_basic_packed tcfa_bstats;
|
|
struct gnet_stats_basic_packed tcfa_bstats_hw;
|
|
struct gnet_stats_queue tcfa_qstats;
|
|
struct net_rate_estimator __rcu *tcfa_rate_est;
|
|
spinlock_t tcfa_lock;
|
|
struct gnet_stats_basic_cpu __percpu *cpu_bstats;
|
|
struct gnet_stats_basic_cpu __percpu *cpu_bstats_hw;
|
|
struct gnet_stats_queue __percpu *cpu_qstats;
|
|
struct tc_cookie __rcu *act_cookie;
|
|
struct tcf_chain __rcu *goto_chain;
|
|
u32 tcfa_flags;
|
|
u8 hw_stats;
|
|
u8 used_hw_stats;
|
|
bool used_hw_stats_valid;
|
|
};
|
|
#define tcf_index common.tcfa_index
|
|
#define tcf_refcnt common.tcfa_refcnt
|
|
#define tcf_bindcnt common.tcfa_bindcnt
|
|
#define tcf_action common.tcfa_action
|
|
#define tcf_tm common.tcfa_tm
|
|
#define tcf_bstats common.tcfa_bstats
|
|
#define tcf_qstats common.tcfa_qstats
|
|
#define tcf_rate_est common.tcfa_rate_est
|
|
#define tcf_lock common.tcfa_lock
|
|
|
|
#define TCA_ACT_HW_STATS_ANY (TCA_ACT_HW_STATS_IMMEDIATE | \
|
|
TCA_ACT_HW_STATS_DELAYED)
|
|
|
|
/* Update lastuse only if needed, to avoid dirtying a cache line.
|
|
* We use a temp variable to avoid fetching jiffies twice.
|
|
*/
|
|
static inline void tcf_lastuse_update(struct tcf_t *tm)
|
|
{
|
|
unsigned long now = jiffies;
|
|
|
|
if (tm->lastuse != now)
|
|
tm->lastuse = now;
|
|
if (unlikely(!tm->firstuse))
|
|
tm->firstuse = now;
|
|
}
|
|
|
|
static inline void tcf_tm_dump(struct tcf_t *dtm, const struct tcf_t *stm)
|
|
{
|
|
dtm->install = jiffies_to_clock_t(jiffies - stm->install);
|
|
dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse);
|
|
dtm->firstuse = stm->firstuse ?
|
|
jiffies_to_clock_t(jiffies - stm->firstuse) : 0;
|
|
dtm->expires = jiffies_to_clock_t(stm->expires);
|
|
}
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
#define ACT_P_CREATED 1
|
|
#define ACT_P_DELETED 1
|
|
|
|
typedef void (*tc_action_priv_destructor)(void *priv);
|
|
|
|
struct tc_action_ops {
|
|
struct list_head head;
|
|
char kind[IFNAMSIZ];
|
|
enum tca_id id; /* identifier should match kind */
|
|
size_t size;
|
|
struct module *owner;
|
|
int (*act)(struct sk_buff *, const struct tc_action *,
|
|
struct tcf_result *); /* called under RCU BH lock*/
|
|
int (*dump)(struct sk_buff *, struct tc_action *, int, int);
|
|
void (*cleanup)(struct tc_action *);
|
|
int (*lookup)(struct net *net, struct tc_action **a, u32 index);
|
|
int (*init)(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, struct tc_action **act, int ovr,
|
|
int bind, bool rtnl_held, struct tcf_proto *tp,
|
|
u32 flags, struct netlink_ext_ack *extack);
|
|
int (*walk)(struct net *, struct sk_buff *,
|
|
struct netlink_callback *, int,
|
|
const struct tc_action_ops *,
|
|
struct netlink_ext_ack *);
|
|
void (*stats_update)(struct tc_action *, u64, u64, u64, u64, bool);
|
|
size_t (*get_fill_size)(const struct tc_action *act);
|
|
struct net_device *(*get_dev)(const struct tc_action *a,
|
|
tc_action_priv_destructor *destructor);
|
|
struct psample_group *
|
|
(*get_psample_group)(const struct tc_action *a,
|
|
tc_action_priv_destructor *destructor);
|
|
};
|
|
|
|
struct tc_action_net {
|
|
struct tcf_idrinfo *idrinfo;
|
|
const struct tc_action_ops *ops;
|
|
};
|
|
|
|
static inline
|
|
int tc_action_net_init(struct net *net, struct tc_action_net *tn,
|
|
const struct tc_action_ops *ops)
|
|
{
|
|
int err = 0;
|
|
|
|
tn->idrinfo = kmalloc(sizeof(*tn->idrinfo), GFP_KERNEL);
|
|
if (!tn->idrinfo)
|
|
return -ENOMEM;
|
|
tn->ops = ops;
|
|
tn->idrinfo->net = net;
|
|
mutex_init(&tn->idrinfo->lock);
|
|
idr_init(&tn->idrinfo->action_idr);
|
|
return err;
|
|
}
|
|
|
|
void tcf_idrinfo_destroy(const struct tc_action_ops *ops,
|
|
struct tcf_idrinfo *idrinfo);
|
|
|
|
static inline void tc_action_net_exit(struct list_head *net_list,
|
|
unsigned int id)
|
|
{
|
|
struct net *net;
|
|
|
|
rtnl_lock();
|
|
list_for_each_entry(net, net_list, exit_list) {
|
|
struct tc_action_net *tn = net_generic(net, id);
|
|
|
|
tcf_idrinfo_destroy(tn->ops, tn->idrinfo);
|
|
kfree(tn->idrinfo);
|
|
}
|
|
rtnl_unlock();
|
|
}
|
|
|
|
int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,
|
|
struct netlink_callback *cb, int type,
|
|
const struct tc_action_ops *ops,
|
|
struct netlink_ext_ack *extack);
|
|
int tcf_idr_search(struct tc_action_net *tn, struct tc_action **a, u32 index);
|
|
int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
|
|
struct tc_action **a, const struct tc_action_ops *ops,
|
|
int bind, bool cpustats, u32 flags);
|
|
int tcf_idr_create_from_flags(struct tc_action_net *tn, u32 index,
|
|
struct nlattr *est, struct tc_action **a,
|
|
const struct tc_action_ops *ops, int bind,
|
|
u32 flags);
|
|
void tcf_idr_insert_many(struct tc_action *actions[]);
|
|
void tcf_idr_cleanup(struct tc_action_net *tn, u32 index);
|
|
int tcf_idr_check_alloc(struct tc_action_net *tn, u32 *index,
|
|
struct tc_action **a, int bind);
|
|
int __tcf_idr_release(struct tc_action *a, bool bind, bool strict);
|
|
|
|
static inline int tcf_idr_release(struct tc_action *a, bool bind)
|
|
{
|
|
return __tcf_idr_release(a, bind, false);
|
|
}
|
|
|
|
int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops);
|
|
int tcf_unregister_action(struct tc_action_ops *a,
|
|
struct pernet_operations *ops);
|
|
int tcf_action_destroy(struct tc_action *actions[], int bind);
|
|
int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
|
|
int nr_actions, struct tcf_result *res);
|
|
int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
|
|
struct nlattr *est, char *name, int ovr, int bind,
|
|
struct tc_action *actions[], size_t *attr_size,
|
|
bool rtnl_held, struct netlink_ext_ack *extack);
|
|
struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
|
|
struct nlattr *nla, struct nlattr *est,
|
|
char *name, int ovr, int bind,
|
|
bool rtnl_held,
|
|
struct netlink_ext_ack *extack);
|
|
int tcf_action_dump(struct sk_buff *skb, struct tc_action *actions[], int bind,
|
|
int ref, bool terse);
|
|
int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
|
|
int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
|
|
|
|
static inline void tcf_action_update_bstats(struct tc_action *a,
|
|
struct sk_buff *skb)
|
|
{
|
|
if (likely(a->cpu_bstats)) {
|
|
bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), skb);
|
|
return;
|
|
}
|
|
spin_lock(&a->tcfa_lock);
|
|
bstats_update(&a->tcfa_bstats, skb);
|
|
spin_unlock(&a->tcfa_lock);
|
|
}
|
|
|
|
static inline void tcf_action_inc_drop_qstats(struct tc_action *a)
|
|
{
|
|
if (likely(a->cpu_qstats)) {
|
|
qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));
|
|
return;
|
|
}
|
|
spin_lock(&a->tcfa_lock);
|
|
qstats_drop_inc(&a->tcfa_qstats);
|
|
spin_unlock(&a->tcfa_lock);
|
|
}
|
|
|
|
static inline void tcf_action_inc_overlimit_qstats(struct tc_action *a)
|
|
{
|
|
if (likely(a->cpu_qstats)) {
|
|
qstats_overlimit_inc(this_cpu_ptr(a->cpu_qstats));
|
|
return;
|
|
}
|
|
spin_lock(&a->tcfa_lock);
|
|
qstats_overlimit_inc(&a->tcfa_qstats);
|
|
spin_unlock(&a->tcfa_lock);
|
|
}
|
|
|
|
void tcf_action_update_stats(struct tc_action *a, u64 bytes, u64 packets,
|
|
u64 drops, bool hw);
|
|
int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);
|
|
|
|
int tcf_action_check_ctrlact(int action, struct tcf_proto *tp,
|
|
struct tcf_chain **handle,
|
|
struct netlink_ext_ack *newchain);
|
|
struct tcf_chain *tcf_action_set_ctrlact(struct tc_action *a, int action,
|
|
struct tcf_chain *newchain);
|
|
|
|
#ifdef CONFIG_INET
|
|
DECLARE_STATIC_KEY_FALSE(tcf_frag_xmit_count);
|
|
#endif
|
|
|
|
int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));
|
|
#endif /* CONFIG_NET_CLS_ACT */
|
|
|
|
static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,
|
|
u64 packets, u64 drops,
|
|
u64 lastuse, bool hw)
|
|
{
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
if (!a->ops->stats_update)
|
|
return;
|
|
|
|
a->ops->stats_update(a, bytes, packets, drops, lastuse, hw);
|
|
#endif
|
|
}
|
|
|
|
|
|
#endif
|