3 files changed, 15 insertions, 11 deletions

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 1dae5f2b358f..c8cf4d10c435 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -258,7 +258,8 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
         if (is_redirect) {
                 skb2->tc_redirected = 1;
                 skb2->tc_from_ingress = skb2->tc_at_ingress;
-
+                if (skb2->tc_from_ingress)
+                        skb2->tstamp = 0;
                 /* let's the caller reinsert the packet, if possible */
                 if (use_reinsert) {
                         res->ingress = want_ingress;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 9aada2d0ef06..c6c327874abc 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -709,11 +709,23 @@ static int fl_set_enc_opt(struct nlattr **tb, struct fl_flow_key *key,
                           struct netlink_ext_ack *extack)
 {
         const struct nlattr *nla_enc_key, *nla_opt_key, *nla_opt_msk = NULL;
-        int option_len, key_depth, msk_depth = 0;
+        int err, option_len, key_depth, msk_depth = 0;
+
+        err = nla_validate_nested(tb[TCA_FLOWER_KEY_ENC_OPTS],
+                                  TCA_FLOWER_KEY_ENC_OPTS_MAX,
+                                  enc_opts_policy, extack);
+        if (err)
+                return err;
 
         nla_enc_key = nla_data(tb[TCA_FLOWER_KEY_ENC_OPTS]);
 
         if (tb[TCA_FLOWER_KEY_ENC_OPTS_MASK]) {
+                err = nla_validate_nested(tb[TCA_FLOWER_KEY_ENC_OPTS_MASK],
+                                          TCA_FLOWER_KEY_ENC_OPTS_MAX,
+                                          enc_opts_policy, extack);
+                if (err)
+                        return err;
+
                 nla_opt_msk = nla_data(tb[TCA_FLOWER_KEY_ENC_OPTS_MASK]);
                 msk_depth = nla_len(tb[TCA_FLOWER_KEY_ENC_OPTS_MASK]);
         }
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 57b3ad9394ad..2c38e3d07924 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -648,15 +648,6 @@ deliver:
                          */
                         skb->dev = qdisc_dev(sch);
 
-#ifdef CONFIG_NET_CLS_ACT
-                        /*
-                         * If it's at ingress let's pretend the delay is
-                         * from the network (tstamp will be updated).
-                         */
-                        if (skb->tc_redirected && skb->tc_from_ingress)
-                                skb->tstamp = 0;
-#endif
-
                         if (q->slot.slot_next) {
                                 q->slot.packets_left--;
                                 q->slot.bytes_left -= qdisc_pkt_len(skb);