From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 855431B707 for ; Tue, 10 Apr 2018 18:34:18 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id x4so24483417wmh.5 for ; Tue, 10 Apr 2018 09:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=0PkH/umcJVjXp/kzzU4kuZCr/2QpIl5tB1o/gkg98wI=; b=gdAhHOI0OQu6WNkuTomWzlQAL/YgtdBz1LpQ/oM8cPrjg1FUh26VFcxcET5o2PPhqa vh8OgyML8j6EqwfcDFzGGBY+pZSAznwCFb8hspv1wZsoFVwCqr92JFV0eqYa4TB2KAyB Xiwsa+3aHrLYLtAA49sRlidp1wFfgRMMjMa1UKlTrZ2o0n3E3g+wxm4GqQ/LLgi5OtEO XQI/XJMjTI+JxaVg3Tu2qF6rN4DphtI7B3D82iSAU4Qfuh4wAWsjTvLk6awWCwquhRfo dLYWlKgTu1iBRI0ew9Sv1x0qgJpdamTvpeyOdpECPq3ckzB3p4uynOW+E0IXf6vSaL4J piyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=0PkH/umcJVjXp/kzzU4kuZCr/2QpIl5tB1o/gkg98wI=; b=Imil0IGB9H1wevEvWBIWREvhQGd+IBKrTjXqNrmBMExRUbz+e0nQADq6W5XmI7ugPM DVtPSN2jRpgYm23E//R4P8Ui89jN7M7B1c+E4RhCeX2UeFkmGIdvhxzhs792/jiWnbLD VwX3+7jrVS7wqNOqRpzcj/QEr78OFjYLN5ZQbGJ1GuJ/8y2JQdVFtLLjTmLn2rIr7jTs NtQizImofbqYgMcET3EVvJV4QE7MmcFlx+JM6TpXrK/kV4IboBnlb0dLFKNiloWRWjqy yFPFJQfQ/XfpbAH+RkF/8FYWCOG3kpnZfBGnFodrkaDNRB8pxYmAg0nzMr+bDiEvY3Jm ntPw== X-Gm-Message-State: ALQs6tBPL67qfShI9Yf4Kpt9Ik0ESD409RPN4BDQLJTuUXSVJT/BsOWY CAfNMMV8roiopQDpoQbh1822SA== X-Google-Smtp-Source: AIpwx48WDF7KMa0B12K/ZCLg6QyPRdN54JRD+ekLIya78zMjx41mhCh28K+41cHezOcQY6rx6/Xm2A== X-Received: by 10.28.150.71 with SMTP id y68mr130031wmd.139.1523378058344; Tue, 10 Apr 2018 09:34:18 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id h197sm2935642wmd.3.2018.04.10.09.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 09:34:17 -0700 (PDT) Date: Tue, 10 Apr 2018 18:34:04 +0200 From: Adrien Mazarguil To: dev@dpdk.org Cc: stable@dpdk.org, Shahaf Shuler Message-ID: <20180410161132.8776-2-adrien.mazarguil@6wind.com> References: <20180406131243.19037-1-adrien.mazarguil@6wind.com> <20180410161132.8776-1-adrien.mazarguil@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180410161132.8776-1-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-stable] [PATCH v4 01/11] net/mlx4: fix RSS resource leak in case of error X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2018 16:34:18 -0000 When memory cannot be allocated for a flow rule, its RSS context reference is not dropped. Fixes: 078b8b452e6b ("net/mlx4: add RSS flow rule action support") Cc: stable@dpdk.org Signed-off-by: Adrien Mazarguil Cc: Shahaf Shuler --- drivers/net/mlx4/mlx4_flow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index 2d55bfe03..a3b4480b4 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -820,11 +820,14 @@ mlx4_flow_prepare(struct priv *priv, }, }; - if (!mlx4_zmallocv(__func__, vec, RTE_DIM(vec))) + if (!mlx4_zmallocv(__func__, vec, RTE_DIM(vec))) { + if (temp.rss) + mlx4_rss_put(temp.rss); return rte_flow_error_set (error, -rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "flow rule handle allocation failure"); + } /* Most fields will be updated by second pass. */ *flow = (struct rte_flow){ .ibv_attr = temp.ibv_attr, -- 2.11.0