Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / sched / ematch.c

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index b0b04b3..d4d6f9c 100644 (file)
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -242,6 +242,9 @@ static int tcf_em_validate(struct tcf_proto *tp,
                        goto errout;
 
                if (em->ops->change) {
+                       err = -EINVAL;
+                       if (em_hdr->flags & TCF_EM_SIMPLE)
+                               goto errout;
                        err = em->ops->change(net, data, data_len, em);
                        if (err < 0)
                                goto errout;