{"id":819409,"url":"http://patchwork.ozlabs.org/api/patches/819409/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170928044132.30940-5-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170928044132.30940-5-saeedm@mellanox.com>","list_archive_url":null,"date":"2017-09-28T04:41:25","name":"[net,04/11] net/mlx5e: Fix erroneous freeing of encap header buffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2d546c6c775a59a57208ae2e3b0e488a7a8ba7d1","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170928044132.30940-5-saeedm@mellanox.com/mbox/","series":[{"id":5488,"url":"http://patchwork.ozlabs.org/api/series/5488/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5488","date":"2017-09-28T04:41:23","name":"Mellanox, mlx5 fixes 2017-09-28","version":1,"mbox":"http://patchwork.ozlabs.org/series/5488/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819409/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819409/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y2hrP1sxMz9t3x\n\tfor ;\n\tThu, 28 Sep 2017 14:42:45 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752039AbdI1Emj (ORCPT );\n\tThu, 28 Sep 2017 00:42:39 -0400","from mail-il-dmz.mellanox.com ([193.47.165.129]:54384 \"EHLO\n\tmellanox.co.il\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1751276AbdI1EmF (ORCPT\n\t); Thu, 28 Sep 2017 00:42:05 -0400","from Internal Mail-Server by MTLPINE1 (envelope-from\n\tsaeedm@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 28 Sep 2017 06:42:01 +0200","from sws.mtl.labs.mlnx (reg-l-vrt-045-015.mtl.labs.mlnx\n\t[10.135.45.15])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v8S4g1j8011096;\n\tThu, 28 Sep 2017 07:42:01 +0300"],"From":"Saeed Mahameed ","To":"\"David S. Miller\" ","Cc":"netdev@vger.kernel.org, Paul Blakey ,\n\tSaeed Mahameed ","Subject":"[net 04/11] net/mlx5e: Fix erroneous freeing of encap header buffer","Date":"Thu, 28 Sep 2017 07:41:25 +0300","Message-Id":"<20170928044132.30940-5-saeedm@mellanox.com>","X-Mailer":"git-send-email 2.13.0","In-Reply-To":"<20170928044132.30940-1-saeedm@mellanox.com>","References":"<20170928044132.30940-1-saeedm@mellanox.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Paul Blakey \n\nIn case the neighbour for the tunnel destination isn't valid,\nwe send a neighbour update request but we free the encap\nheader buffer. This is wrong, because we still need it for\nallocating a HW encap entry once the neighbour is available.\n\nFix that by skipping freeing it if we wait for neighbour.\n\nFixes: 232c001398ae ('net/mlx5e: Add support to neighbour update flow')\nSigned-off-by: Paul Blakey \nReviewed-by: Or Gerlitz \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 18 ++++++++++--------\n 1 file changed, 10 insertions(+), 8 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\nindex da503e6411da..4e2fc016bdd6 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c\n@@ -1564,7 +1564,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv,\n \t\tbreak;\n \tdefault:\n \t\terr = -EOPNOTSUPP;\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \t}\n \tfl4.flowi4_tos = tun_key->tos;\n \tfl4.daddr = tun_key->u.ipv4.dst;\n@@ -1573,7 +1573,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv,\n \terr = mlx5e_route_lookup_ipv4(priv, mirred_dev, &out_dev,\n \t\t\t\t &fl4, &n, &ttl);\n \tif (err)\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \n \t/* used by mlx5e_detach_encap to lookup a neigh hash table\n \t * entry in the neigh hash table when a user deletes a rule\n@@ -1590,7 +1590,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv,\n \t */\n \terr = mlx5e_rep_encap_entry_attach(netdev_priv(out_dev), e);\n \tif (err)\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \n \tread_lock_bh(&n->lock);\n \tnud_state = n->nud_state;\n@@ -1630,8 +1630,9 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv,\n \n destroy_neigh_entry:\n \tmlx5e_rep_encap_entry_detach(netdev_priv(e->out_dev), e);\n-out:\n+free_encap:\n \tkfree(encap_header);\n+out:\n \tif (n)\n \t\tneigh_release(n);\n \treturn err;\n@@ -1668,7 +1669,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv,\n \t\tbreak;\n \tdefault:\n \t\terr = -EOPNOTSUPP;\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \t}\n \n \tfl6.flowlabel = ip6_make_flowinfo(RT_TOS(tun_key->tos), tun_key->label);\n@@ -1678,7 +1679,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv,\n \terr = mlx5e_route_lookup_ipv6(priv, mirred_dev, &out_dev,\n \t\t\t\t &fl6, &n, &ttl);\n \tif (err)\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \n \t/* used by mlx5e_detach_encap to lookup a neigh hash table\n \t * entry in the neigh hash table when a user deletes a rule\n@@ -1695,7 +1696,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv,\n \t */\n \terr = mlx5e_rep_encap_entry_attach(netdev_priv(out_dev), e);\n \tif (err)\n-\t\tgoto out;\n+\t\tgoto free_encap;\n \n \tread_lock_bh(&n->lock);\n \tnud_state = n->nud_state;\n@@ -1736,8 +1737,9 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv,\n \n destroy_neigh_entry:\n \tmlx5e_rep_encap_entry_detach(netdev_priv(e->out_dev), e);\n-out:\n+free_encap:\n \tkfree(encap_header);\n+out:\n \tif (n)\n \t\tneigh_release(n);\n \treturn err;\n","prefixes":["net","04/11"]}