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 DD07541E9F for ; Wed, 15 Mar 2023 15:37:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8865410FB; Wed, 15 Mar 2023 15:37:23 +0100 (CET) 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 EF3D740A7A for ; Wed, 15 Mar 2023 15:37:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891039; 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=1Yv+PkoMaSnOZfDvxYexYvuMeJGaMqZKzZriouAwFPA=; b=jEZ+bfrxYsaUpPjX43fTuyLM3Nr6pAtrH/mFBAJiAcTyTE32n7pckgncpri43jMhTClMpJ t8O40sN/C4qQGjH8FN2djVxr0AIUzWxvZ7R29xxjk8g8jH4gEpjhnFBBLAXsk9YsKWmO6G ggj6YL1rub8LxnMkQIO3gQ4Itok+J2A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-ZELkJoEXP-OYzXTyO7cD4A-1; Wed, 15 Mar 2023 10:37:16 -0400 X-MC-Unique: ZELkJoEXP-OYzXTyO7cD4A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7BB9801779; Wed, 15 Mar 2023 14:37:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5469440C6E68; Wed, 15 Mar 2023 14:37:15 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'dma/skeleton: fix empty devargs parsing' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:22 +0000 Message-Id: <20230315143640.677317-29-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/23. 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/c6dd06ddb62c2b1f6731fa73a764cbf11cf43264 Thanks. Kevin --- >From c6dd06ddb62c2b1f6731fa73a764cbf11cf43264 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 2 Mar 2023 07:50:11 +0000 Subject: [PATCH] dma/skeleton: fix empty devargs parsing [ upstream commit e0e5dd0450db22fc7712da4b5a8e6fd6e081c870 ] The rte_kvargs_process() was used to parse KV pairs, it also supports to parse 'only keys' (e.g. socket_id) type. And the callback function parameter 'value' is NULL when parsed 'only keys'. This patch fixes segment fault when parse input args with 'only keys' (e.g. lcore). Fixes: 05d5fc66a269 ("dma/skeleton: introduce skeleton driver") Signed-off-by: Chengwen Feng --- drivers/dma/skeleton/skeleton_dmadev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/dma/skeleton/skeleton_dmadev.c b/drivers/dma/skeleton/skeleton_dmadev.c index 6b0bb14e2c..08bf20e899 100644 --- a/drivers/dma/skeleton/skeleton_dmadev.c +++ b/drivers/dma/skeleton/skeleton_dmadev.c @@ -512,7 +512,13 @@ skeldma_parse_lcore(const char *key __rte_unused, void *opaque) { - int lcore_id = atoi(value); + int lcore_id; + + if (value == NULL || opaque == NULL) + return -EINVAL; + + lcore_id = atoi(value); if (lcore_id >= 0 && lcore_id < RTE_MAX_LCORE) *(int *)opaque = lcore_id; + return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.303767738 +0000 +++ 0029-dma-skeleton-fix-empty-devargs-parsing.patch 2023-03-15 14:30:20.594123731 +0000 @@ -1 +1 @@ -From e0e5dd0450db22fc7712da4b5a8e6fd6e081c870 Mon Sep 17 00:00:00 2001 +From c6dd06ddb62c2b1f6731fa73a764cbf11cf43264 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e0e5dd0450db22fc7712da4b5a8e6fd6e081c870 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 9b6da655fd..daf35eccce 100644 +index 6b0bb14e2c..08bf20e899 100644 @@ -25 +26 @@ -@@ -516,7 +516,13 @@ skeldma_parse_lcore(const char *key __rte_unused, +@@ -512,7 +512,13 @@ skeldma_parse_lcore(const char *key __rte_unused,