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 EB88941EA5 for ; Wed, 15 Mar 2023 23:47:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E728F40FDF; Wed, 15 Mar 2023 23:47:24 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 04BBA410DD for ; Wed, 15 Mar 2023 23:47:22 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id j2so18673134wrh.9 for ; Wed, 15 Mar 2023 15:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N7YuEXnjWLkti0eS82hLFBBJK4dU3B8a2K2Rm5s4cb4=; b=iS4cnJtG26cGf3wM2MgYeLzsRBdUfVahtyrNnHViU63Wpo01/Q/1B5/xiYnkSjhXDG 34rpUdSM4l4Fm0O/sONITm5g1hIPYn5ZKQrggU/goc2M4JSE3zDBKbl4QvuMyLhGo92/ DGk8h5d9XE5HrCJ70OR4x+Mpw+ZhbHMayg8nlHWlgQR1uLkpuk53Leza7lkGOd8mRBpP cWSP4Ffrz2J2j6QcWkHUt0KMT8XgG0eKhRwH9QshF0T8O+uKtbkyo26WHOavmE7Xc3Rm jXPHCj1qgjJYYduOJt7K+4N/R3TGJadrRWl5jUYWJmJO0VRbzX8Ff/T8VE7Bn3G/H3NQ gwJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N7YuEXnjWLkti0eS82hLFBBJK4dU3B8a2K2Rm5s4cb4=; b=KBC6n7ykORAFNXm7AJxVhIunPlVw0lIuanfGZihemz2CIL/fsvNjl2Y81LgL8oVynJ W06YLdadk/nEFihRhehS0DWtRHcy+AbhGDSyo6RaI/h+v4O/wqtTv4tPtqfoy9Ot9kbo V9KofNoRLSV0TBJmB8qAfDZjtjjTw/2RFeW3CWan3K+h5XMt6Hj31fUrmLJYkXWHMzgx WqFi0Avi98Pps3C5tGIGiLbcc+Gz7KL5ucnn1N8iW8Zto1mz0CLl54z18DfC27T2MlCR Jjpwre0RDJZyCPbqNKEqVbPKD5TekX7J+ZwhN5/qasdbvvh2eO9yXcYIJ4bEWzss47yY OtvQ== X-Gm-Message-State: AO0yUKX2RyLPxU+o9/bRp1ZmFNXy8GBnYPw92CxDwU6w2U4GKuFELxA/ Bqoz8tYA/6Tp1SCNU4t+co+8qoCYdDybOg== X-Google-Smtp-Source: AK7set+7zfu+RVML3Coc+oRR9EOzZZ6rpQDwZkDrZXk0pybQ2LWB+HbOwqC40DhTGzPeoYUzvL9QQQ== X-Received: by 2002:a5d:6990:0:b0:2ce:a898:a896 with SMTP id g16-20020a5d6990000000b002cea898a896mr3205399wru.30.1678920441685; Wed, 15 Mar 2023 15:47:21 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id a16-20020a056000101000b002c54e26bca5sm5771414wrx.49.2023.03.15.15.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:47:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Akhil Goyal , dpdk stable Subject: patch 'cryptodev: fix empty devargs parsing' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:46:09 +0000 Message-Id: <20230315224631.1025649-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/18cf7a4204c687686a03ef8f54fd725295a6f091 Thanks. Luca Boccassi --- >From 18cf7a4204c687686a03ef8f54fd725295a6f091 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/librte_cryptodev/rte_cryptodev_pmd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c index 5445b015d9..d532ed8582 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.c +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c @@ -17,6 +17,9 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, struct rte_cryptodev_pmd_init_params *params = extra_args; 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) return -EINVAL; @@ -33,6 +36,10 @@ 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; i = strtol(value, &end, 10); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:50.663876980 +0000 +++ 0018-cryptodev-fix-empty-devargs-parsing.patch 2023-03-15 22:44:49.571850010 +0000 @@ -1 +1 @@ -From 8146454c56636ba8af5263b57e1c4a9f67fd4a39 Mon Sep 17 00:00:00 2001 +From 18cf7a4204c687686a03ef8f54fd725295a6f091 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8146454c56636ba8af5263b57e1c4a9f67fd4a39 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ - lib/cryptodev/cryptodev_pmd.c | 7 +++++++ + lib/librte_cryptodev/rte_cryptodev_pmd.c | 7 +++++++ @@ -26,5 +27,5 @@ -diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c -index 77b269f312..d8073a601d 100644 ---- a/lib/cryptodev/cryptodev_pmd.c -+++ b/lib/cryptodev/cryptodev_pmd.c -@@ -22,6 +22,9 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, +diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.c b/lib/librte_cryptodev/rte_cryptodev_pmd.c +index 5445b015d9..d532ed8582 100644 +--- a/lib/librte_cryptodev/rte_cryptodev_pmd.c ++++ b/lib/librte_cryptodev/rte_cryptodev_pmd.c +@@ -17,6 +17,9 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused, @@ -40 +41 @@ -@@ -38,6 +41,10 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused, +@@ -33,6 +36,10 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused,