From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id F041729CB for ; Tue, 1 May 2018 12:47:26 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id o15-v6so10473728wro.11 for ; Tue, 01 May 2018 03:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KZ/m3Jrifc5LPeyLeLc4ced2V4iPbqbJk9FvZlL9APc=; b=Rqo8coDNDSsPhXXlabwRPNPNrXXOpiuCCD2TqxDNOo6c7C3ejOCJ59B3iTK4UHojd7 RQ4u6hdPlumbATFgnwklpY6IQ0QfDcHOCKyHys3BS3SHJftMUr8IOqq7axwnEnfbPX8G IacmfaA09oZPFoDR8xO3Bo7ngUj6mcZ+01txqHrB60z82DzYdwhzRr2hB4VcpT79rRfm Zcs6dBpZJjl5SCnywc/YbZkajbh3Ul93XKKehWQ0lx7EIrqgjhfLMpDhHK0P4DrFa2JC JbZKolplC96ZYsr5X7yjPE+KS1Vd9YyOC07GDTsc+yJLAkO4p67xXLPwjROeR1U3eHop fhVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KZ/m3Jrifc5LPeyLeLc4ced2V4iPbqbJk9FvZlL9APc=; b=dUx2U7tdpcRCW3pHuABMEzXp6oPNtw9dFkhL1hr/XeNG87oR0C/zNa2mg7vHI7hs2z NeRgDwl8glugxAeVe4D8eBOAe57q8NR8/ZevyCIvy++UAlGm9zc4Yk5m7hvZSrLO0CQB KtVJwAU+bwArS5DGK/SQ3rWaMwVhzhKuJInQfmmyEZC/xfWlUd7GS+/fGBTYmeb9XrIP nkHolnl6Va/0BH2MxplOO0f119XtstqlLSkkE4sCdB5ByIScfEHYjq+h3FptRXtU8YyP aO9ETkMZNHzGd3015U4DWrhtvIahoczj7gjHFnV9lbZm7dzklpH8YZ76PnCHFwDRwpPB 3VgA== X-Gm-Message-State: ALQs6tCpagzi/P5R+Fu0IUUHrtVZwR7Xh+5CkhNVCbR9S5qij0+LseeK x0kYX7qNTmRP/slyobr7lVk= X-Google-Smtp-Source: AB8JxZocQMhcblrlvY7ijoIMa/70PQeIexU9FFEKWTKwDpoEo7eBOsBmKeDLPe1WPK+CIVH+4/hEOw== X-Received: by 2002:adf:b859:: with SMTP id u25-v6mr11290323wrf.162.1525171646571; Tue, 01 May 2018 03:47:26 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id b66sm10255521wma.48.2018.05.01.03.47.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 03:47:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: Olivier Matz , dpdk stable Date: Tue, 1 May 2018 11:44:57 +0100 Message-Id: <20180501104509.17238-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180501104509.17238-1-luca.boccassi@gmail.com> References: <20180501104509.17238-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'mempool: fix leak when no objects are populated' has been queued to LTS release 16.11.7 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, 01 May 2018 10:47:27 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/03/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 576ef3d15bf7c6916edae9196aad65d24f459f25 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 16 Apr 2018 14:24:30 +0100 Subject: [PATCH] mempool: fix leak when no objects are populated [ upstream commit 25e6755056eaba45921b898b9986af68277ac6ac ] Fixes: 84121f197187 ("mempool: store memory chunks in a list") Suggested-by: Olivier Matz Signed-off-by: Andrew Rybchenko Acked-by: Olivier Matz --- lib/librte_mempool/rte_mempool.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index aa513b973..011fa9bbd 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -396,12 +396,18 @@ rte_mempool_populate_phys(struct rte_mempool *mp, char *vaddr, } /* not enough room to store one object */ - if (i == 0) - return -EINVAL; + if (i == 0) { + ret = -EINVAL; + goto fail; + } STAILQ_INSERT_TAIL(&mp->mem_list, memhdr, next); mp->nb_mem_chunks++; return i; + +fail: + rte_free(memhdr); + return ret; } /* Add objects in the pool, using a table of physical pages. Return the -- 2.14.2