net/mlx5e: Don't store direct pointer to action's tunnel info

author Vlad Buslov <vladbu@mellanox.com>

Tue, 10 Sep 2019 11:38:17 +0000 (14:38 +0300)

committer Saeed Mahameed <saeedm@mellanox.com>

Tue, 29 Oct 2019 23:27:19 +0000 (16:27 -0700)
author Vlad Buslov <vladbu@mellanox.com>
Tue, 10 Sep 2019 11:38:17 +0000 (14:38 +0300)
committer Saeed Mahameed <saeedm@mellanox.com>
Tue, 29 Oct 2019 23:27:19 +0000 (16:27 -0700)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index c4c59d2e676e6affa279a251f5ba125dc9fa8111..fda0b37075e8c444bdf2adba3a0e5dc47ca47adf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1278,8 +1278,10 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
         mlx5_eswitch_del_vlan_action(esw, attr);
  
         for (out_index = 0; out_index < MLX5_MAX_FLOW_FWD_VPORTS; out_index++)
-               if (attr->dests[out_index].flags & MLX5_ESW_DEST_ENCAP)
+               if (attr->dests[out_index].flags & MLX5_ESW_DEST_ENCAP) {
                         mlx5e_detach_encap(priv, flow, out_index);
+                       kfree(attr->parse_attr->tun_info[out_index]);
+               }
         kvfree(attr->parse_attr);
  
         if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
@@ -1559,6 +1561,7 @@ static void mlx5e_encap_dealloc(struct mlx5e_priv *priv, struct mlx5e_encap_entr
                         mlx5_packet_reformat_dealloc(priv->mdev, e->pkt_reformat);
         }
  
+       kfree(e->tun_info);
         kfree(e->encap_header);
         kfree_rcu(e, rcu);
  }
@@ -2972,6 +2975,13 @@ mlx5e_encap_get(struct mlx5e_priv *priv, struct encap_key *key,
         return NULL;
  }
  
+static struct ip_tunnel_info *dup_tun_info(const struct ip_tunnel_info *tun_info)
+{
+       size_t tun_size = sizeof(*tun_info) + tun_info->options_len;
+
+       return kmemdup(tun_info, tun_size, GFP_KERNEL);
+}
+
  static int mlx5e_attach_encap(struct mlx5e_priv *priv,
                               struct mlx5e_tc_flow *flow,
                               struct net_device *mirred_dev,
@@ -3028,13 +3038,15 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv,
         refcount_set(&e->refcnt, 1);
         init_completion(&e->res_ready);
  
+       tun_info = dup_tun_info(tun_info);
+       if (!tun_info) {
+               err = -ENOMEM;
+               goto out_err_init;
+       }
         e->tun_info = tun_info;
         err = mlx5e_tc_tun_init_encap_attr(mirred_dev, priv, e, extack);
-       if (err) {
-               kfree(e);
-               e = NULL;
-               goto out_err;
-       }
+       if (err)
+               goto out_err_init;
  
         INIT_LIST_HEAD(&e->flows);
         hash_add_rcu(esw->offloads.encap_tbl, &e->encap_hlist, hash_key);
@@ -3075,6 +3087,12 @@ out_err:
         if (e)
                 mlx5e_encap_put(priv, e);
         return err;
+
+out_err_init:
+       mutex_unlock(&esw->offloads.encap_tbl_lock);
+       kfree(tun_info);
+       kfree(e);
+       return err;
  }
  
  static int parse_tc_vlan_action(struct mlx5e_priv *priv,
@@ -3295,7 +3313,9 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                         } else if (encap) {
                                 parse_attr->mirred_ifindex[attr->out_count] =
                                         out_dev->ifindex;
-                               parse_attr->tun_info[attr->out_count] = info;
+                               parse_attr->tun_info[attr->out_count] = dup_tun_info(info);
+                               if (!parse_attr->tun_info[attr->out_count])
+                                       return -ENOMEM;
                                 encap = false;
                                 attr->dests[attr->out_count].flags |=
                                         MLX5_ESW_DEST_ENCAP;
author	Vlad Buslov <vladbu@mellanox.com>
	Tue, 10 Sep 2019 11:38:17 +0000 (14:38 +0300)
committer	Saeed Mahameed <saeedm@mellanox.com>
	Tue, 29 Oct 2019 23:27:19 +0000 (16:27 -0700)