From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 5DA917CEA for ; Thu, 19 Apr 2018 12:07:40 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id f14-v6so12429568wre.4 for ; Thu, 19 Apr 2018 03:07:40 -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=f3yKAIbsfootN2Trc/wvgUrGMz8JLiGPVYKwDcXwD0o=; b=zUZurLct/IZdG2xkCJNpv3iudTT/fPQlaPbtUSGTfe39gwa6lO+c3b0VzPMAyRHpNW Kj4MXKbwMqaHqI8gmqkDBCTnc6h+/f77OaNeQPuW9YrEqu+ZpnGFMbaaScyOvdxH8lPQ Et8ZOwzDFF3v6o7hirldtWBZ0svcbxdAVOG8XLPBwqwn66TQbkC5O8d+PlVZ9haWVouf bu7g2m3BlLGRcrduEhty0fufsTC/t8B36uwSL7CSlr7jGG1dx9YnS4TxLZKgStzS3Vz5 nr9YEeau3zWY2COnkvKC220y6iSSQnf/kjo7xSDVOfATmUwgB4fVhOImoePRsXyLOR7W 51Og== 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=f3yKAIbsfootN2Trc/wvgUrGMz8JLiGPVYKwDcXwD0o=; b=UAC2aERReGUrPVCcQfjEoEESwo03mK3U7j49luDlA2dT94RCx2IvoZ3X9w5HvFo4zv 77wrxuCV/xmaPGm00jOiakXkn/IGJdhRlV2WroCbEqu9Ra0RvMrMedULklgt4U3OKbBs aQinAwI3L16ljJx+P9Hj05FogaHtMSrHVMRqxQsV8dF4v3QH4UtT9EyozgRC6AIGWHPV SC+09Od8kZaSkZV8jO1pXhcfF1EXSj5FKm7jEEvBRv0uwh1AZMVdgs+ST58JihEmCuUx f3fYZoZp1UGDHhVyUjToqz/i9r98+1hI9uOcpWkH3G3LLH+3Q/y/K25MhF8jYF8ylCCA Hh7w== X-Gm-Message-State: ALQs6tBtV/mz0z852N5pyCFB/TJaTTKeRWJxxjY5x/aIkZrgYsZQRn2x 2cuyp9Fxk64gIOcyfhT7kDr24QeX X-Google-Smtp-Source: AIpwx481kNvWKKO+oEuBAIvPEbHAGcWkQy8K8H0F7wIXItfu14E4KFwbB2bwTir6iLAqtgwyehOBgg== X-Received: by 2002:adf:90c3:: with SMTP id i61-v6mr4302319wri.227.1524132460028; Thu, 19 Apr 2018 03:07:40 -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 u36-v6sm6445155wrf.87.2018.04.19.03.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 03:07:39 -0700 (PDT) Date: Thu, 19 Apr 2018 12:07:25 +0200 From: Adrien Mazarguil To: dev@dpdk.org Cc: stable@dpdk.org, Shahaf Shuler Message-ID: <20180419100204.5728-2-adrien.mazarguil@6wind.com> References: <20180416150058.2620-1-adrien.mazarguil@6wind.com> <20180419100204.5728-1-adrien.mazarguil@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180419100204.5728-1-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH v6 01/11] net/mlx4: fix RSS resource leak in case of error X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2018 10:07:40 -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 Acked-by: Nelio Laranjeiro 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 f3063ee8a..2b4bf7094 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