From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Eli Cohen <eli@mellanox.com>, Roi Dayan <roid@mellanox.com>,
Vlad Buslov <vladbu@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net-next V2 4/7] net/mlx5e: Fix error flow cleanup in mlx5e_tc_tun_create_header_ipv4/6
Date: Wed, 13 Nov 2019 22:41:38 +0000 [thread overview]
Message-ID: <20191113224059.19051-5-saeedm@mellanox.com> (raw)
In-Reply-To: <20191113224059.19051-1-saeedm@mellanox.com>
From: Eli Cohen <eli@mellanox.com>
Be sure to release the neighbour in case of failures after successful
route lookup.
Signed-off-by: Eli Cohen <eli@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
.../ethernet/mellanox/mlx5/core/en/tc_tun.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index 4f78efeb6ee8..5316cedd78bf 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -239,12 +239,15 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
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
@@ -355,12 +358,15 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
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
--
2.21.0
next prev parent reply other threads:[~2019-11-13 22:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 22:41 [pull request][net-next V2 0/7] Mellanox, mlx5 updates 2019-11-12 Saeed Mahameed
2019-11-13 22:41 ` [net-next V2 1/7] net/mlx5: DR, Fix matcher builders select check Saeed Mahameed
2019-11-13 22:41 ` [net-next V2 2/7] net/mlx5: Read num_vfs before disabling SR-IOV Saeed Mahameed
2019-11-13 22:41 ` [net-next V2 3/7] net/mlx5: Remove redundant NULL initializations Saeed Mahameed
2019-11-13 22:41 ` Saeed Mahameed [this message]
2019-11-13 22:41 ` [net-next V2 5/7] net/mlx5e: Set netdev name space on creation Saeed Mahameed
2019-11-13 22:41 ` [net-next V2 6/7] net/mlx5: Add devlink reload Saeed Mahameed
2019-11-13 22:41 ` [net-next V2 7/7] net/mlx5: TC: Offload flow table rules Saeed Mahameed
2019-11-15 2:02 ` [pull request][net-next V2 0/7] Mellanox, mlx5 updates 2019-11-12 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191113224059.19051-5-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=davem@davemloft.net \
--cc=eli@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=roid@mellanox.com \
--cc=vladbu@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).