lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 15/95] net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6
    Date
    From: Eli Cohen <eli@mellanox.com>

    [ Upstream commit a86db2269fca8019074b720baf2e0a35cddac4e9 ]

    Be sure to release the neighbour in case of failures after successful
    route lookup.

    Fixes: 101f4de9dd52 ("net/mlx5e: Move TC tunnel offloading code to separate source file")
    Signed-off-by: Eli Cohen <eli@mellanox.com>
    Reviewed-by: Roi Dayan <roid@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
    @@ -232,12 +232,15 @@ int mlx5e_tc_tun_create_header_ipv4(stru
    if (max_encap_size < ipv4_encap_size) {
    mlx5_core_warn(priv->mdev, "encap size %d too big, max supported is %d\n",
    ipv4_encap_size, max_encap_size);
    - return -EOPNOTSUPP;
    + err = -EOPNOTSUPP;
    + goto out;
    }

    encap_header = kzalloc(ipv4_encap_size, GFP_KERNEL);
    - if (!encap_header)
    - return -ENOMEM;
    + if (!encap_header) {
    + err = -ENOMEM;
    + goto out;
    + }

    /* used by mlx5e_detach_encap to lookup a neigh hash table
    * entry in the neigh hash table when a user deletes a rule
    @@ -348,12 +351,15 @@ int mlx5e_tc_tun_create_header_ipv6(stru
    if (max_encap_size < ipv6_encap_size) {
    mlx5_core_warn(priv->mdev, "encap size %d too big, max supported is %d\n",
    ipv6_encap_size, max_encap_size);
    - return -EOPNOTSUPP;
    + err = -EOPNOTSUPP;
    + goto out;
    }

    encap_header = kzalloc(ipv6_encap_size, GFP_KERNEL);
    - if (!encap_header)
    - return -ENOMEM;
    + if (!encap_header) {
    + err = -ENOMEM;
    + goto out;
    + }

    /* used by mlx5e_detach_encap to lookup a neigh hash table
    * entry in the neigh hash table when a user deletes a rule

    \
     
     \ /
      Last update: 2019-11-27 22:21    [W:4.359 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site