diff options
| author | David S. Miller | 2019-05-08 02:22:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-05-08 02:22:09 +0200 |
| commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
| tree | 544bf5861113e2f7e676a333a1267d887c800870 /net/sched | |
| parent | net: phy: improve pause mode reporting in phy_print_status (diff) | |
| parent | cxgb4: Fix error path in cxgb4_init_module (diff) | |
| download | kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.gz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.xz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_cgroup.c | 2 | ||||
| -rw-r--r-- | net/sched/cls_matchall.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 037d128c2851..35659127e5a3 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -32,6 +32,8 @@ static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp, struct cls_cgroup_head *head = rcu_dereference_bh(tp->root); u32 classid = task_get_classid(skb); + if (unlikely(!head)) + return -1; if (!classid) return -1; if (!tcf_em_tree_match(skb, &head->ematches, NULL)) diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c index da916f39b719..1e98a517fb0b 100644 --- a/net/sched/cls_matchall.c +++ b/net/sched/cls_matchall.c @@ -32,6 +32,9 @@ static int mall_classify(struct sk_buff *skb, const struct tcf_proto *tp, { struct cls_mall_head *head = rcu_dereference_bh(tp->root); + if (unlikely(!head)) + return -1; + if (tc_skip_sw(head->flags)) return -1; |