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=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 3DBC0C4363D for ; Fri, 25 Sep 2020 12:50:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 033A722B2D for ; Fri, 25 Sep 2020 12:50:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038227; bh=ytIlshj3OR06WSOjzGwur6HuZbKtReovabXBz7KS66k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MENsGBOfbsuhL9/CtZ6jaAEIwG2/KNnChBtrKPViR34eMU3jYkJXqjMjTC5cxfTLW qi/5vSwUwVyIn9KejoVPMy2gznc1yBoISn+lToTuu9yrDL1dPixpUfvTh8B1jkI6EV UM8tLlhQZIruQBlKHBGKEty9qsFk2+pZmwfegBLE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729062AbgIYMuZ (ORCPT ); Fri, 25 Sep 2020 08:50:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:54266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729050AbgIYMuV (ORCPT ); Fri, 25 Sep 2020 08:50:21 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 3A1BC21741; Fri, 25 Sep 2020 12:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038220; bh=ytIlshj3OR06WSOjzGwur6HuZbKtReovabXBz7KS66k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pVnPKFRWz4z0FF69SkqO9cTs/Wa5RVY3Lxa+f4Ajx6qofwvb1GA+QvQPTbxu0R0oj QxPT+1nmm5CDpydXnmSL05IYJuqR75aYYMKXuxKToP/oswWGwbpPZZbLg7bKLYY1yC 4hxeRMDugaWb9mJkCA6F6W300eLpC+hJUil3HgwU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianbo Liu , Roi Dayan , Saeed Mahameed Subject: [PATCH 5.8 47/56] net/mlx5e: Fix memory leak of tunnel info when rule under multipath not ready Date: Fri, 25 Sep 2020 14:48:37 +0200 Message-Id: <20200925124734.891831137@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124727.878494124@linuxfoundation.org> References: <20200925124727.878494124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jianbo Liu [ Upstream commit 12a240a41427d37b5e70570700704e84c827452f ] When deleting vxlan flow rule under multipath, tun_info in parse_attr is not freed when the rule is not ready. Fixes: ef06c9ee8933 ("net/mlx5e: Allow one failure when offloading tc encap rules under multipath") Signed-off-by: Jianbo Liu Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1399,11 +1399,8 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_put_flow_tunnel_id(flow); - if (flow_flag_test(flow, NOT_READY)) { + if (flow_flag_test(flow, NOT_READY)) remove_unready_flow(flow); - kvfree(attr->parse_attr); - return; - } if (mlx5e_is_offloaded_flow(flow)) { if (flow_flag_test(flow, SLOW))