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 88A70A0093 for ; Tue, 19 May 2020 15:11:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F8A71D6F8; Tue, 19 May 2020 15:11:18 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id B1AEE1D6F8 for ; Tue, 19 May 2020 15:11:17 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id m185so3493607wme.3 for ; Tue, 19 May 2020 06:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=csj6BsTU21iNjzIMK+fk5BAJkFtOyn/mOKRwczyQC/g=; b=usZ8+OoGbKc66qL+lFcnlCj5GXrxkzFEepRgnxH42P2x+GaQyFsAq3kTKvVck23gqb /bfsUOcjnuoZmlD06bVCgun9Cp75/isOpJWJCPw3vvFO1RoldJqTpuSGHEfycUEaPFhu 68iD+1Nd8HRe5/I1uwflF1/OEsUqbUFptc7KAEPYUI4HrONnfBAz4XewGo1M67D0/d2l 2DcVEJoeHMJ75/ZEg/JnUfvFcrmik624mcVunye/Jnon78136QHM7/ZbMeQpeHms10KZ bknBhxOaUZdeso7rKsXtvmkye/gQzxSNmp1dwGhtNR6mjV1p0FY9FHFUlkKsL3xOT6tb hoRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=csj6BsTU21iNjzIMK+fk5BAJkFtOyn/mOKRwczyQC/g=; b=kPlYtdUzQCOjGqy9GGquTgUzDneqqUrPo94XIpe6zif70tcWRUBwdk/HRGftClAhRH fJ5w6D9oXjb6n83VI48p9zulgHqZRk6rUFu2vLIwwOmHKRh0PmqHnWZdFKyMua0kruyn QpaNnI1ebTFOnx8SiFZZQ8+70jd+PRBvSzE666unq20pldfc2RpUxt8wKpDapYJ11QPY 09sbT7Baavoxe+83VCviq5Kv+qEyfELW2vQWkrymmwvZHCd4LOYInd4cs9YF2g9qe9YL UoX5PN91b5BWDs36g1wnfCJGspuRi+i1tBV9IKNd2d/dMI94pnu/hzgLnD4A2szWmf6h bsCg== X-Gm-Message-State: AOAM531x+Omu0Qb+DzFCD3jRD3mMj2Bc2bmmvPOjsi5maQbuNi2FQcSf Gx4dnKj6ps27PcNyieGbUA0= X-Google-Smtp-Source: ABdhPJyLt5KKa8ZMDZfTKMnUO8YPYiPooK2luZppjMI+Wf0fT3hBSU/scRaxITDnls9ZYN8HMAM3/w== X-Received: by 2002:a1c:3b87:: with SMTP id i129mr5744918wma.38.1589893876558; Tue, 19 May 2020 06:11:16 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t71sm4040620wmt.31.2020.05.19.06.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:16 -0700 (PDT) From: luca.boccassi@gmail.com To: Ivan Dyukov Cc: Maxime Coquelin , dpdk stable Date: Tue, 19 May 2020 14:03:56 +0100 Message-Id: <20200519130549.112823-101-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: fix devargs parsing' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 4c587687f7c913b75a9dabc5787fb556cd158cd4 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 5637001dfc..741b3b0d60 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -477,12 +477,17 @@ static int 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; } static struct rte_eth_dev * -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.574119922 +0100 +++ 0101-net-virtio-user-fix-devargs-parsing.patch 2020-05-19 14:04:44.312650112 +0100 @@ -1,15 +1,16 @@ -From bc5b6c11bd81ada50345db5919dc6c7850f91de1 Mon Sep 17 00:00:00 2001 +From 4c587687f7c913b75a9dabc5787fb556cd158cd4 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") -Cc: stable@dpdk.org Signed-off-by: Ivan Dyukov Reviewed-by: Maxime Coquelin