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 DF8811B2B9 for ; Fri, 26 Jan 2018 14:14:10 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id b21so21149697wme.4 for ; Fri, 26 Jan 2018 05:14:10 -0800 (PST) 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=zHosQeN/X/9fwhT5S/A/bOELAv7OELI8khDq9d6DFT8=; b=NlP+Ne3k7QhtCbi0PNQxAGXuDqs93uaJj/u/ezgONV7vT2gyunFcb4EHFWM1my0ehd kw+8jvxpC3vqEfyyipaoSYsx0xRJHExBVveHptUxDIAHO5uySqVvnqilbVjDbQvQfw8c 2k0a2BbBPlsxZb7MXpx+yGy/RNAVU93gmPFEc/E6YaCWEwoplIfNZB/arMrddUMdEX0N 0vCeHNumFNUUl5Zd7DHE932BULl6tnIdPLdqlHTv798RS8B9hb3uU0yERfbsQaTagy/n guLkIum6qhmf0nm9T9GhqHH25NhoEo6iNZIA7aKRX+YECyP3RTiWzY3ZpUkfvjWZh4q0 6/AQ== 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=zHosQeN/X/9fwhT5S/A/bOELAv7OELI8khDq9d6DFT8=; b=maAqzk+LvIep91cROpzAyBQmqgiMRwSJ01+cb0yK/ouWdc2TowgV8fL51FevwJv7Jg OaI9X7j607fZ841EQhmbDpfO8rOhye16alaLTVJ71bmcv61beCoeayUJ2Whppqi9591y N4nXmd2WKHE33NmRsEEa4bmADhVqXVvmjx8c5Tl/+VQbf4HF9+5Rb2otXqkK9M5iPI50 7gTFnjZp0NlEOjdJwqHDwwTald0JaHv1Kmx/9a8njKWmLmqR8pANaMds5yAiTcHf2eEM ule1gqc3bg+/3QLPnrP12/s4Q+gNfmmeUvMBSkH5z0Fc7QJL+sb6KgmhW92Po8Uq2KAh Aa2A== X-Gm-Message-State: AKwxyteJLgrVwOgiwKqJZ8F0afT2AvrM8SA6DtMfI2lPUlfO6Q+r3v9u ASWEZxnZ0WwqL6QJXUvooIgsoUim X-Google-Smtp-Source: AH8x225ybtiLht5A74VJWn+rD5RD+bw4QNXPz7gMdLDWVuYbSH6CG2as/GYx0yXCup9gg/8mlSIDUw== X-Received: by 10.28.48.10 with SMTP id w10mr11227192wmw.93.1516972450635; Fri, 26 Jan 2018 05:14:10 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id c14sm4273135wmh.2.2018.01.26.05.14.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 05:14:10 -0800 (PST) From: luca.boccassi@gmail.com To: Anatoly Burakov Cc: dpdk stable Date: Fri, 26 Jan 2018 13:12:38 +0000 Message-Id: <20180126131332.15346-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126131332.15346-1-luca.boccassi@gmail.com> References: <20180126131332.15346-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'memzone: fix leak on allocation error' has been queued to LTS release 16.11.5 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: Fri, 26 Jan 2018 13:14:11 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/28/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 35430daa0c92615da27fc7087b83f21372485320 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 21 Dec 2017 18:07:07 +0000 Subject: [PATCH] memzone: fix leak on allocation error [ upstream commit db22d31a79733f08e974f134c883361fd8641984 ] We check if there's space in config after we allocated the memzone, but if there isn't, we never free it back. This patch adds memzone free if there's no room in memzone config. Fixes: ff909fe21f0a ("mem: introduce memzone freeing") Signed-off-by: Anatoly Burakov --- lib/librte_eal/common/eal_common_memzone.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c index 64f4e0ade..b58d85b71 100644 --- a/lib/librte_eal/common/eal_common_memzone.c +++ b/lib/librte_eal/common/eal_common_memzone.c @@ -236,7 +236,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len, return NULL; } - const struct malloc_elem *elem = malloc_elem_from_data(mz_addr); + struct malloc_elem *elem = malloc_elem_from_data(mz_addr); /* fill the zone in config */ mz = get_next_free_memzone(); @@ -244,6 +244,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len, if (mz == NULL) { RTE_LOG(ERR, EAL, "%s(): Cannot find free memzone but there is room " "in config!\n", __func__); + malloc_elem_free(elem); rte_errno = ENOSPC; return NULL; } -- 2.14.2