From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 50EFCA0555 for ; Wed, 25 May 2022 18:30:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A7AE400EF; Wed, 25 May 2022 18:30:22 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DA1DC4281C for ; Wed, 25 May 2022 18:30:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kOfuQCIEyDMQgukyxol9lz/voXqLfmOYSdrUvsiu26k=; b=E4stfWqL5N/UvpuiJa9LrwzciZdXsO0+4ZmJnVjdPu3EaAtapJ8Nh0rolgVPw8Llg1UpyG xHCFujzpVeMWHkRqrQ0exE43JKLcZHbGm2HT8zqu7ya7SHthJro1GlnjknCc4TaXILIj7D P9XuvLHWZgGDQOAFeH7TlBMD10VgqjE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-18-Mq_0j7EPPwaTDaW9-U7Z-g-1; Wed, 25 May 2022 12:30:18 -0400 X-MC-Unique: Mq_0j7EPPwaTDaW9-U7Z-g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D09062949BA4 for ; Wed, 25 May 2022 16:30:17 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0438F2026D64; Wed, 25 May 2022 16:30:16 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Subject: patch 'devargs: fix leak on hotplug failure' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:47 +0100 Message-Id: <20220525162847.711753-55-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 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/30/22. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/214462a05b8e0cf08bbd06c10441d25baae17137 Thanks. Kevin --- >From 214462a05b8e0cf08bbd06c10441d25baae17137 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 14 Apr 2022 13:27:56 +0200 Subject: [PATCH] devargs: fix leak on hotplug failure [ upstream commit 26d734b5d280b96f91f00f5e0c6c7eff99facef2 ] Caught by ASan, if a secondary process tried to attach a device with an incorrect driver name, devargs was leaked. Fixes: 64051bb1f144 ("devargs: unify scratch buffer storage") Signed-off-by: David Marchand --- lib/eal/common/eal_common_dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c index e1e9976d8d..07f285f862 100644 --- a/lib/eal/common/eal_common_dev.c +++ b/lib/eal/common/eal_common_dev.c @@ -186,6 +186,8 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev) err_devarg: - if (rte_devargs_remove(da) != 0) + if (rte_devargs_remove(da) != 0) { rte_devargs_reset(da); + free(da); + } return ret; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.849839718 +0100 +++ 0055-devargs-fix-leak-on-hotplug-failure.patch 2022-05-25 17:26:58.665828475 +0100 @@ -1 +1 @@ -From 26d734b5d280b96f91f00f5e0c6c7eff99facef2 Mon Sep 17 00:00:00 2001 +From 214462a05b8e0cf08bbd06c10441d25baae17137 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26d734b5d280b96f91f00f5e0c6c7eff99facef2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index c0ee4e442f..9d913e5478 100644 +index e1e9976d8d..07f285f862 100644 @@ -21 +22 @@ -@@ -181,6 +181,8 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev) +@@ -186,6 +186,8 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)