diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-08-19 12:36:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-22 17:02:31 -0700 |
| commit | b9a24bb76bf611a5268ceffe04219e6ad264559b (patch) | |
| tree | 78aefca9f8e4da33abea28a0ff61fbc59fd2c66d /include/net/pkt_cls.h | |
| parent | c1346a7e70b5be7f01cc1f64a7e3aefb80d48ad7 (diff) | |
| download | linux-b9a24bb76bf611a5268ceffe04219e6ad264559b.tar.gz linux-b9a24bb76bf611a5268ceffe04219e6ad264559b.tar.xz | |
net_sched: properly handle failure case of tcf_exts_init()
After commit 22dc13c837c3 ("net_sched: convert tcf_exts from list to pointer array")
we do dynamic allocation in tcf_exts_init(), therefore we need
to handle the ENOMEM case properly.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_cls.h')
| -rw-r--r-- | include/net/pkt_cls.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index c99508d426cc..a459be5fe1c2 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -69,17 +69,19 @@ struct tcf_exts { int police; }; -static inline void tcf_exts_init(struct tcf_exts *exts, int action, int police) +static inline int tcf_exts_init(struct tcf_exts *exts, int action, int police) { #ifdef CONFIG_NET_CLS_ACT exts->type = 0; exts->nr_actions = 0; exts->actions = kcalloc(TCA_ACT_MAX_PRIO, sizeof(struct tc_action *), GFP_KERNEL); - WARN_ON(!exts->actions); /* TODO: propagate the error to callers */ + if (!exts->actions) + return -ENOMEM; #endif exts->action = action; exts->police = police; + return 0; } /** |