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 2F0A641EA1 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 2C59F42BB1; 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 0F2E642C4D for ; Wed, 15 Mar 2023 15:37:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891036; 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=Z+ChxkDDEZaKDe5iKDyzSQDr6+fZrRxLJ42YwjDOnHQ=; b=MHJkuee3PnRA8Vv87RnxV6H+mbqllM79I9fbQWQOnJzUYJsUHdbLVrrS2PRzGZwpAukGVD SHKSiBIiz3iCg2PNTWOyKR7t1F4IalvL6S38igIB+sJP2er5hz0V0/cgO3Ej0g3eTFH/TN sY+t++GHkNWKMz+bKJnvHlEt8jf2lAk= 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-675-BbJd4wxOP3OhgFBnBq3i5w-1; Wed, 15 Mar 2023 10:37:15 -0400 X-MC-Unique: BbJd4wxOP3OhgFBnBq3i5w-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 0B8AD884627; 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 571F040C6E67; Wed, 15 Mar 2023 14:37:14 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix empty devargs parsing' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:21 +0000 Message-Id: <20230315143640.677317-28-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/cbb039980138c4626c2dfb4e56a7ee051e6c9e6b Thanks. Kevin --- >From cbb039980138c4626c2dfb4e56a7ee051e6c9e6b Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 2 Mar 2023 07:50:10 +0000 Subject: [PATCH] net/virtio: fix empty devargs parsing [ upstream commit 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 ] 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. vectorized,vdpa). Fixes: 4710e16a4a7b ("net/virtio: add parameter to enable vectorized path") Fixes: 44d7b2e87b69 ("net/virtio: refactor devargs parsing") Fixes: 440f03c25378 ("net/virtio: skip device probe in vDPA mode") Signed-off-by: Chengwen Feng Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 3 +++ drivers/net/virtio/virtio_pci_ethdev.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 38bfe050b5..df9ee9fde6 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2457,4 +2457,7 @@ static int vectorized_check_handler(__rte_unused const char *key, const char *value, void *ret_val) { + if (value == NULL || ret_val == NULL) + return -EINVAL; + if (strcmp(value, "1") == 0) *(int *)ret_val = 1; diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c index 1f6bdeddda..f786ac2c9e 100644 --- a/drivers/net/virtio/virtio_pci_ethdev.c +++ b/drivers/net/virtio/virtio_pci_ethdev.c @@ -149,4 +149,7 @@ static int vdpa_check_handler(__rte_unused const char *key, const char *value, void *ret_val) { + if (value == NULL || ret_val == NULL) + return -EINVAL; + if (strcmp(value, "1") == 0) *(int *)ret_val = 1; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.280302618 +0000 +++ 0028-net-virtio-fix-empty-devargs-parsing.patch 2023-03-15 14:30:20.592123724 +0000 @@ -1 +1 @@ -From 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 Mon Sep 17 00:00:00 2001 +From cbb039980138c4626c2dfb4e56a7ee051e6c9e6b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c1b35b59b4cee8836f34498b7c55b49de39d7b3 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index dc6856d749..ae84d313be 100644 +index 38bfe050b5..df9ee9fde6 100644 @@ -29 +30 @@ -@@ -2057,4 +2057,7 @@ static int vectorized_check_handler(__rte_unused const char *key, +@@ -2457,4 +2457,7 @@ static int vectorized_check_handler(__rte_unused const char *key, @@ -38 +39 @@ -index abc63b0935..9b4b846f8a 100644 +index 1f6bdeddda..f786ac2c9e 100644