From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE68FA04DD for ; Wed, 28 Oct 2020 11:54:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E1D29CA4A; Wed, 28 Oct 2020 11:54:33 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by dpdk.org (Postfix) with ESMTP id 5BCC3CA37 for ; Wed, 28 Oct 2020 11:54:32 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id w1so5183228wrm.4 for ; Wed, 28 Oct 2020 03:54:32 -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 :mime-version:content-transfer-encoding; bh=JVK1/uoh9L1YppAWXsOhfia17genqhhgFsipscNU7l4=; b=bnBqsWM6Wdry5UwM7ZCjIfLF5H5JhWbBZ/N7TVhhw8+0UPtmWvP+ewKsfUG6SrLV3P GM28rkuuVJx4IRJe/18QO9aVC9jhsDT8OQsH7A1TnpJaHp5YcP/WKHVLUtsHnoWPUF6z 0D1PWn/ErDMJF8idY9HbyUuBkFlkjB3k6WjlZlsGTDEqPAvv20zLEtHDxGaPFKsLIR8n iufC333de5whcOHHvCDK73TiR7PIgEW/M0oqSooN3FIjFqc4l2R/E2WiTp7veS8hnrjl 2h08w15j60lbQa3+cED9Imm//1GwB7pjlu9r/b0upgj4Rx0vhzpLsEkFLSZQU74aftYe nMBw== 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:mime-version:content-transfer-encoding; bh=JVK1/uoh9L1YppAWXsOhfia17genqhhgFsipscNU7l4=; b=EIlHNsoLYgiiSxKV2BA+A0DGFOI1ll10yT0d3e1CKd+qQ4eVzYNgt2ZxUCVz7fT9KS i/RqXxWDrmIoC2WEoXvrykM9w31JylrNuHaHEUYs2voGFn6MXHZB0P8zra7/WRzVxzvZ C+nwG95opWxqZfTxOgq2wxAHVrY9dCQs03aOGx9KWrwGgXfTjDYZKCPrEDqmqQFt2c0P futTNt9DCPN2C33KjBi4c/XlklMaJ7l6KWFwWaW2pYBXQiRkpljmESr7OpuDHVsjZJGx p/v70DiYTrcSx+/q2VYxWigXF8YR7Ym7UGhfY6ibarAju+qLcCB4c8f3JThz65ikZWl9 7v/w== X-Gm-Message-State: AOAM532NHqe+RM36odQmrTYBsHT2ad0iudLcgYP4WfnXQrovV/0yT2ni Q5KU06XqRdC6t92Ze/cnkTg= X-Google-Smtp-Source: ABdhPJzeTKq+pnDpPG2HHhYkdEpBFXNHpUBCEAOk61bcdOVDnp7K45Ivqzp2l4eL9IfSQsD22i1YnQ== X-Received: by 2002:adf:fe48:: with SMTP id m8mr8074682wrs.127.1603882472097; Wed, 28 Oct 2020 03:54:32 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j17sm6270756wrw.68.2020.10.28.03.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:54:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Jerin Jacob , dpdk stable Date: Wed, 28 Oct 2020 10:45:17 +0000 Message-Id: <20201028104606.3504127-158-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eventdev: fix adapter leak in error path' has been queued to stable release 19.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 0da6f9ab3f97ac8234667c32c30302328c8b6b23 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 29 Sep 2020 21:46:33 +0800 Subject: [PATCH] eventdev: fix adapter leak in error path [ upstream commit b7b09dab5e9507541222d1d2ce86f55e9eb32b9e ] In rte_event_crypto_adapter_create_ext() allocated memory for adapter, we should free it when error happens, otherwise it will lead to memory leak. Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation") Signed-off-by: Yunjian Wang Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_event_crypto_adapter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c index 22d9108168..db9af8c200 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c @@ -240,6 +240,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, if (ret < 0) { RTE_EDEV_LOG_ERR("Failed to get info for eventdev %d: %s!", dev_id, dev_info.driver_name); + rte_free(adapter); return ret; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.638291516 +0000 +++ 0158-eventdev-fix-adapter-leak-in-error-path.patch 2020-10-28 10:35:11.756833733 +0000 @@ -1,14 +1,15 @@ -From b7b09dab5e9507541222d1d2ce86f55e9eb32b9e Mon Sep 17 00:00:00 2001 +From 0da6f9ab3f97ac8234667c32c30302328c8b6b23 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 29 Sep 2020 21:46:33 +0800 Subject: [PATCH] eventdev: fix adapter leak in error path +[ upstream commit b7b09dab5e9507541222d1d2ce86f55e9eb32b9e ] + In rte_event_crypto_adapter_create_ext() allocated memory for adapter, we should free it when error happens, otherwise it will lead to memory leak. Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Jerin Jacob @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+) diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c -index 8f25933163..b04312128a 100644 +index 22d9108168..db9af8c200 100644 --- a/lib/librte_eventdev/rte_event_crypto_adapter.c +++ b/lib/librte_eventdev/rte_event_crypto_adapter.c -@@ -241,6 +241,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, +@@ -240,6 +240,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id, if (ret < 0) { RTE_EDEV_LOG_ERR("Failed to get info for eventdev %d: %s!", dev_id, dev_info.driver_name);