| Message ID | 20170518153441.24398-1-weiyj.lk@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, May 18, 2017 at 03:34:41PM +0000, Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > 'encap_header' is malloced and should be freed before leaving from > the error handling cases, otherwise it will cause memory leak. > > Fixes: 232c001398ae ("net/mlx5e: Add support to neighbour update flow") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > index 11c27e4..a72ecbc 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > @@ -1404,8 +1404,8 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, > > if (!(nud_state & NUD_VALID)) { > neigh_event_send(n, NULL); > - neigh_release(n); > - return -EAGAIN; > + err = -EAGAIN; > + goto out; > } > > err = mlx5_encap_alloc(priv->mdev, e->tunnel_type, > @@ -1510,8 +1510,8 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, > > if (!(nud_state & NUD_VALID)) { > neigh_event_send(n, NULL); > - neigh_release(n); > - return -EAGAIN; > + err = -EAGAIN; > + goto out; > } Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > > err = mlx5_encap_alloc(priv->mdev, e->tunnel_type, > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Wei Yongjun <weiyj.lk@gmail.com> Date: Thu, 18 May 2017 15:34:41 +0000 > From: Wei Yongjun <weiyongjun1@huawei.com> > > 'encap_header' is malloced and should be freed before leaving from > the error handling cases, otherwise it will cause memory leak. > > Fixes: 232c001398ae ("net/mlx5e: Add support to neighbour update flow") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 11c27e4..a72ecbc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1404,8 +1404,8 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, if (!(nud_state & NUD_VALID)) { neigh_event_send(n, NULL); - neigh_release(n); - return -EAGAIN; + err = -EAGAIN; + goto out; } err = mlx5_encap_alloc(priv->mdev, e->tunnel_type, @@ -1510,8 +1510,8 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, if (!(nud_state & NUD_VALID)) { neigh_event_send(n, NULL); - neigh_release(n); - return -EAGAIN; + err = -EAGAIN; + goto out; } err = mlx5_encap_alloc(priv->mdev, e->tunnel_type,