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 1692BA04DD for ; Wed, 28 Oct 2020 11:55:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0ED8ECAAE; Wed, 28 Oct 2020 11:55:37 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id 8DEA8CAAA for ; Wed, 28 Oct 2020 11:55:35 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 13so4111996wmf.0 for ; Wed, 28 Oct 2020 03:55:35 -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=c8D/6h1lQ07HjLrJcxx042f7P/zpTx1vaA8Hk/kyTSc=; b=SDoLSMqU0BOCkm4UcLZ9JhyQimf4zcf/BheUvxK9uIwLhU1CnkPgoHMoXeWgLXtWJH HJGn5lcdWznDTLitFy2eN5R0bzC9OQzwsxrp0UhwzidnYMAT3imZS0/7/RGobdSSnFW9 EQS5WVXmFnIibOwK4nZCad2caXnxT7SgJGM/ztOYSoOU2SOZEszI6FjKpxWXBZ15nhII XuDMrApHEs/ArIRXoeOA808wH48USxSvmP8wwcbNMQW9A3X0p68/H8GI0goXv2b0H/v4 oaID9vt9cAjrhH4ifLN2RASGot9H+/8ysDHHKhjS/uB5s/U+j1y3KePeOK8frIt1aoov dnpw== 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=c8D/6h1lQ07HjLrJcxx042f7P/zpTx1vaA8Hk/kyTSc=; b=eLonjU0EnJRUPf20iShCXFJzsGNCA/cs1sf9Wc1Zrz1sODKTpNWioqyyvWYwolfEXx MCPLky/U3qDm4SK4q+bQpwqH2jnW31iaRbZnlrhNfw6253wVuQs239PUIm12nN9DxBkV oKk/EG97k7Ikrq3KN63redwfy8KZV6j+6ZmjjD+TMsqNmX51d3ytKbtopsExRIKmK4aU 1jlAGehJ/01dxBXKgausU8MiNRAP4DLVrAdQxjGs3axXr1sVLRVLkgvN5ztdp252lU8G RL/QaX+8E+WlHQRjNuBMm5SRt8ZGkkhJdRpnUwibjWMqrQ7jeqnfByad2BEhCzgy27/x QU4w== X-Gm-Message-State: AOAM5313QanInE0UqAzk7GoOMN/i0QABkJ6uCX6x8oP6sIfmEHKoqsVH rPm3GaXPgJ1yLonTq2AK+HQ2vD1gCfBykrVJ X-Google-Smtp-Source: ABdhPJxAuxWrKtg1agAuZx01MFzK+RBqwo1oXZ/4ZkIsIgUp8mpYKICXvJ8qSSOqu+zwTE+Wodd05A== X-Received: by 2002:a7b:c408:: with SMTP id k8mr7638463wmi.68.1603882534319; Wed, 28 Oct 2020 03:55:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f14sm6266012wrr.80.2020.10.28.03.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:55:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Laatz Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:45:36 +0000 Message-Id: <20201028104606.3504127-177-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ring: check internal arguments' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 f0a2c7875173de240a75e5f6fedbb5d9068b4d40 Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Tue, 13 Oct 2020 14:07:04 +0100 Subject: [PATCH] net/ring: check internal arguments [ upstream commit e37bbe212d48a7375a6239478a114829d05692b5 ] Add a check for the return value of the sscanf call in parse_internal_args(), returning an error if we don't get the expected result. Coverity issue: 362049 Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API") Signed-off-by: Kevin Laatz Reviewed-by: Ferruh Yigit --- drivers/net/ring/rte_eth_ring.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index f0fafa0c0d..f35f54e78d 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -16,6 +16,7 @@ #define ETH_RING_ACTION_CREATE "CREATE" #define ETH_RING_ACTION_ATTACH "ATTACH" #define ETH_RING_INTERNAL_ARG "internal" +#define ETH_RING_INTERNAL_ARG_MAX_LEN 19 /* "0x..16chars..\0" */ static const char *valid_arguments[] = { ETH_RING_NUMA_NODE_ACTION_ARG, @@ -539,8 +540,21 @@ parse_internal_args(const char *key __rte_unused, const char *value, { struct ring_internal_args **internal_args = data; void *args; + int ret, n; - sscanf(value, "%p", &args); + /* make sure 'value' is valid pointer length */ + if (strnlen(value, ETH_RING_INTERNAL_ARG_MAX_LEN) >= + ETH_RING_INTERNAL_ARG_MAX_LEN) { + PMD_LOG(ERR, "Error parsing internal args, argument is too long"); + return -1; + } + + ret = sscanf(value, "%p%n", &args, &n); + if (ret == 0 || (size_t)n != strlen(value)) { + PMD_LOG(ERR, "Error parsing internal args"); + + return -1; + } *internal_args = args; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.210498506 +0000 +++ 0177-net-ring-check-internal-arguments.patch 2020-10-28 10:35:11.784834145 +0000 @@ -1,15 +1,16 @@ -From e37bbe212d48a7375a6239478a114829d05692b5 Mon Sep 17 00:00:00 2001 +From f0a2c7875173de240a75e5f6fedbb5d9068b4d40 Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Tue, 13 Oct 2020 14:07:04 +0100 Subject: [PATCH] net/ring: check internal arguments +[ upstream commit e37bbe212d48a7375a6239478a114829d05692b5 ] + Add a check for the return value of the sscanf call in parse_internal_args(), returning an error if we don't get the expected result. Coverity issue: 362049 Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API") -Cc: stable@dpdk.org Signed-off-by: Kevin Laatz Reviewed-by: Ferruh Yigit @@ -18,7 +19,7 @@ 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c -index 83c5502123..22c0802688 100644 +index f0fafa0c0d..f35f54e78d 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -16,6 +16,7 @@ @@ -29,7 +30,7 @@ static const char *valid_arguments[] = { ETH_RING_NUMA_NODE_ACTION_ARG, -@@ -571,8 +572,21 @@ parse_internal_args(const char *key __rte_unused, const char *value, +@@ -539,8 +540,21 @@ parse_internal_args(const char *key __rte_unused, const char *value, { struct ring_internal_args **internal_args = data; void *args;