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 5965941E9F for ; Wed, 15 Mar 2023 15:37:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5538242C24; Wed, 15 Mar 2023 15:37:19 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A2C5440141 for ; Wed, 15 Mar 2023 15:37:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891037; 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=RdV4Nbeuo1HbRW6F+KV0746WT+PBBnEMtFWd31xWQJc=; b=V9p8i4lWnpKMpVZT0WMEQKoUEYmNZfwFALUivRaxzeIn137PoFQV6gX4/KhCG6OHttPiz9 ZQSzsn7JF4x3Kd3SxMKIgtAT+cVXJx2TCjjAp5xshuGJgorRxJwBWXYwt59JFNxseHNLU2 q5IMND52k0eRbzxh3v4Orh/0A4MduPE= 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-631-8q6GPM_VOb-npY4UnuPbxw-1; Wed, 15 Mar 2023 10:37:13 -0400 X-MC-Unique: 8q6GPM_VOb-npY4UnuPbxw-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 2D98B38149AE; Wed, 15 Mar 2023 14:37:13 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CAFB40C6E67; Wed, 15 Mar 2023 14:37:12 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Akhil Goyal , dpdk stable Subject: patch 'cryptodev: fix empty devargs parsing' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:19 +0000 Message-Id: <20230315143640.677317-26-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/52480ab3aef902d59b91f2b8a1115ce036ee0685 Thanks. Kevin --- >From 52480ab3aef902d59b91f2b8a1115ce036ee0685 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 2 Mar 2023 07:50:07 +0000 Subject: [PATCH] cryptodev: fix empty devargs parsing [ upstream commit 8146454c56636ba8af5263b57e1c4a9f67fd4a39 ] 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 in rte_cryptodev_pmd_parse_uint_arg() when parse input args with 'only keys' (e.g. socket_id, max_nb_queue_pairs). For a similar reason, this patch fixes rte_cryptodev_pmd_parse_name_arg(). Fixes: 9e6edea41805 ("cryptodev: add APIs to assist PMD initialisation") Signed-off-by: Chengwen Feng Acked-by: Akhil Goyal --- lib/cryptodev/cryptodev_pmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c index 3b8ccdcede..d1d8ecef98 100644 --- a/lib/cryptodev/cryptodev_pmd.c +++ b/lib/cryptodev/cryptodev_pmd.c @@ -20,4 +20,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, int n; + if (value == NULL || extra_args == NULL) + return -EINVAL; + n = strlcpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN); if (n >= RTE_CRYPTODEV_NAME_MAX_LEN) @@ -36,4 +39,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused, int i; char *end; + + if (value == NULL || extra_args == NULL) + return -EINVAL; + errno = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.234371989 +0000 +++ 0026-cryptodev-fix-empty-devargs-parsing.patch 2023-03-15 14:30:20.588123710 +0000 @@ -1 +1 @@ -From 8146454c56636ba8af5263b57e1c4a9f67fd4a39 Mon Sep 17 00:00:00 2001 +From 52480ab3aef902d59b91f2b8a1115ce036ee0685 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8146454c56636ba8af5263b57e1c4a9f67fd4a39 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 77b269f312..d8073a601d 100644 +index 3b8ccdcede..d1d8ecef98 100644 @@ -30 +31 @@ -@@ -23,4 +23,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, +@@ -20,4 +20,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, @@ -38 +39 @@ -@@ -39,4 +42,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused, +@@ -36,4 +39,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused,