From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2DFAFC6195 for ; Fri, 8 Nov 2019 19:12:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1F3D20650 for ; Fri, 8 Nov 2019 19:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240321; bh=oDbZB7orneX006l4dQrazAI3AMgWkUEeoDS5nYSAriU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FvmELpNnCK+pEo/NDh9t2c9tQF4PUx3/+WvVaAdAp0Q+XY1AKQ81yBQx99XbtZQB9 GRQe1aRYbOyXOashtG5ioImdXRBKyTLMGIwzqtNjLEkx1y6sKZ9EwMLvrR/TpSykFm 9S855lUtb6YY7F+sKPFBp+nvli0CznE/34Cac2DI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391810AbfKHTJ7 (ORCPT ); Fri, 8 Nov 2019 14:09:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:42008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391825AbfKHTJ6 (ORCPT ); Fri, 8 Nov 2019 14:09:58 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 80E062196F; Fri, 8 Nov 2019 19:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240198; bh=oDbZB7orneX006l4dQrazAI3AMgWkUEeoDS5nYSAriU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jcMnwfl84vdrXID4t8qBUrTIae9rDxGnOoaIIilOJNXjBmGVQ/j1xyVFzcXEtwDUX 79JPocC52zAmUH2klSYb5gCeCJCA+69qt3SGEFHNUGGfVWqb+YO37tMzaD958utb/8 fqgCAWxtkcyrQfkHXpRWjxu2aHZU6IPfhrzj0eAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Parav Pandit , Saeed Mahameed Subject: [PATCH 5.3 115/140] net/mlx5: Fix rtable reference leak Date: Fri, 8 Nov 2019 19:50:43 +0100 Message-Id: <20191108174912.063099581@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Parav Pandit [ Upstream commit 2347cee83b2bd868bde2d283db0fac89f22be4e0 ] If the rt entry gateway family is not AF_INET for multipath device, rtable reference is leaked. Hence, fix it by releasing the reference. Fixes: 5fb091e8130b ("net/mlx5e: Use hint to resolve route when in HW multipath mode") Fixes: e32ee6c78efa ("net/mlx5e: Support tunnel encap over tagged Ethernet") Signed-off-by: Parav Pandit Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -90,15 +90,19 @@ static int mlx5e_route_lookup_ipv4(struc if (ret) return ret; - if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) + if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) { + ip_rt_put(rt); return -ENETUNREACH; + } #else return -EOPNOTSUPP; #endif ret = get_route_and_out_devs(priv, rt->dst.dev, route_dev, out_dev); - if (ret < 0) + if (ret < 0) { + ip_rt_put(rt); return ret; + } if (!(*out_ttl)) *out_ttl = ip4_dst_hoplimit(&rt->dst); @@ -142,8 +146,10 @@ static int mlx5e_route_lookup_ipv6(struc *out_ttl = ip6_dst_hoplimit(dst); ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev); - if (ret < 0) + if (ret < 0) { + dst_release(dst); return ret; + } #else return -EOPNOTSUPP; #endif