From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E15AFA0093 for ; Thu, 28 May 2020 18:26:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D9AA11D996; Thu, 28 May 2020 18:26:17 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id F02C61D996 for ; Thu, 28 May 2020 18:26:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683176; 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=MhVDwrQG0rBoOu34GTiIRvW5T8X1Q7ZJSpMDDyIarqI=; b=Sworjem8s1nHjU07ajmsAmis6SW9vM60CAq4/TUXQDXpuoR9YW+QI4E0NiDiyHbDYgMrno oTV0mdX9BJy1PPwoETLs1Zucu8jBCzCycJoxElONRbX7x5pZS/nV+aHYk+scmHNOZLKx3E a91GxeIDuFv37IqmZWQsqy2ShGlS4oY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-RiFQt2O8O3aDJugQL6ffdw-1; Thu, 28 May 2020 12:26:11 -0400 X-MC-Unique: RiFQt2O8O3aDJugQL6ffdw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E4CF18FE861; Thu, 28 May 2020 16:26:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id E685960C05; Thu, 28 May 2020 16:26:06 +0000 (UTC) From: Kevin Traynor To: Ivan Dyukov Cc: Maxime Coquelin , dpdk stable Date: Thu, 28 May 2020 17:23:11 +0100 Message-Id: <20200528162322.7863-84-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: fix devargs parsing' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/faf078d72936943caed3c99b0658c08ede859568 Thanks. Kevin. --- >From faf078d72936943caed3c99b0658c08ede859568 Mon Sep 17 00:00:00 2001 From: Ivan Dyukov Date: Mon, 30 Mar 2020 10:58:00 +0300 Subject: [PATCH] net/virtio-user: fix devargs parsing [ upstream commit bc5b6c11bd81ada50345db5919dc6c7850f91de1 ] strtoull returns 0 if it fails to parse input string. It's ignored in get_integer_arg. This patch handles error cases for strtoull function. Fixes: ce2eabdd43ec ("net/virtio-user: add virtual device") Signed-off-by: Ivan Dyukov Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user_ethdev.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 7a2de2ac1a..6c184075dd 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -389,10 +389,15 @@ get_integer_arg(const char *key __rte_unused, const char *value, void *extra_args) { + uint64_t integer = 0; if (!value || !extra_args) return -EINVAL; - - *(uint64_t *)extra_args = strtoull(value, NULL, 0); - - return 0; + errno = 0; + integer = strtoull(value, NULL, 0); + /* extra_args keeps default value, it should be replaced + * only in case of successful parsing of the 'value' arg + */ + if (errno == 0) + *(uint64_t *)extra_args = integer; + return -errno; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.459402707 +0100 +++ 0084-net-virtio-user-fix-devargs-parsing.patch 2020-05-28 17:12:59.174554748 +0100 @@ -1 +1 @@ -From bc5b6c11bd81ada50345db5919dc6c7850f91de1 Mon Sep 17 00:00:00 2001 +From faf078d72936943caed3c99b0658c08ede859568 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc5b6c11bd81ada50345db5919dc6c7850f91de1 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5637001dfc..741b3b0d60 100644 +index 7a2de2ac1a..6c184075dd 100644 @@ -24 +25 @@ -@@ -478,10 +478,15 @@ get_integer_arg(const char *key __rte_unused, +@@ -389,10 +389,15 @@ get_integer_arg(const char *key __rte_unused,