patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Bing Zhao <bingz@mellanox.com>
Cc: Anatoly Burakov <anatoly.burakov@intel.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'mem: fix overflow on allocation' has been queued to LTS release 18.11.9
Date: Fri,  5 Jun 2020 19:24:21 +0100
Message-ID: <20200605182525.22483-24-ktraynor@redhat.com> (raw)
In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com>

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/10/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/246bd855dff27be510ab98af9629124d3f610cd4

Thanks.

Kevin.

---
From 246bd855dff27be510ab98af9629124d3f610cd4 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@mellanox.com>
Date: Thu, 7 May 2020 16:02:54 +0800
Subject: [PATCH] mem: fix overflow on allocation

[ upstream commit b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 ]

The size checking is done in the caller. The size parameter is an
unsigned (64b wide) right now, so the comparison with zero should be
enough in most cases. But it won't help in the following case.
If the allocating request input a huge number by mistake, e.g., some
overflow after the calculation (especially subtraction), the checking
in the caller will succeed since it is not zero. Indeed, there is not
enough space in the system to support such huge memory allocation.
Usually it will return failure in the following code. But if the
input size is just a little smaller than the UINT64_MAX, like -2 in
signed type.
The roundup will cause an overflow and then "reset" the size to 0,
and then only a header (128B now) with zero length will be returned.
The following will be the previous allocation header.
It should be OK in most cases if the application won't access the
memory body. Or else, some critical issue will be caused and not easy
to debug. So this issue should be prevented at the beginning, like
other big size failure, NULL pointer should be returned also.

Fixes: fdf20fa7bee9 ("add prefix to cache line macros")

Signed-off-by: Bing Zhao <bingz@mellanox.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/malloc_heap.c |  3 +++
 test/test/test_malloc.c             | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
index b8f26f2b37..de3b73e8c5 100644
--- a/lib/librte_eal/common/malloc_heap.c
+++ b/lib/librte_eal/common/malloc_heap.c
@@ -239,4 +239,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
 	align = RTE_CACHE_LINE_ROUNDUP(align);
 
+	/* roundup might cause an overflow */
+	if (size == 0)
+		return NULL;
 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
 	if (elem != NULL) {
diff --git a/test/test/test_malloc.c b/test/test/test_malloc.c
index 5e52724194..20788011ad 100644
--- a/test/test/test_malloc.c
+++ b/test/test/test_malloc.c
@@ -698,4 +698,16 @@ test_malloc_bad_params(void)
 		goto err_return;
 
+	/* rte_malloc expected to return null with size will cause overflow */
+	align = RTE_CACHE_LINE_SIZE;
+	size = (size_t)-8;
+
+	bad_ptr = rte_malloc(type, size, align);
+	if (bad_ptr != NULL)
+		goto err_return;
+
+	bad_ptr = rte_realloc(NULL, size, align);
+	if (bad_ptr != NULL)
+		goto err_return;
+
 	return 0;
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.213127889 +0100
+++ 0024-mem-fix-overflow-on-allocation.patch	2020-06-05 19:20:50.750042176 +0100
@@ -1 +1 @@
-From b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 Mon Sep 17 00:00:00 2001
+From 246bd855dff27be510ab98af9629124d3f610cd4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org
@@ -30 +30,0 @@
- app/test/test_malloc.c              | 12 ++++++++++++
@@ -31,0 +32 @@
+ test/test/test_malloc.c             | 12 ++++++++++++
@@ -34,5 +35,17 @@
-diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
-index 40a2f500cd..71b3cfdde5 100644
---- a/app/test/test_malloc.c
-+++ b/app/test/test_malloc.c
-@@ -847,4 +847,16 @@ test_malloc_bad_params(void)
+diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
+index b8f26f2b37..de3b73e8c5 100644
+--- a/lib/librte_eal/common/malloc_heap.c
++++ b/lib/librte_eal/common/malloc_heap.c
+@@ -239,4 +239,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
+ 	align = RTE_CACHE_LINE_ROUNDUP(align);
+ 
++	/* roundup might cause an overflow */
++	if (size == 0)
++		return NULL;
+ 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
+ 	if (elem != NULL) {
+diff --git a/test/test/test_malloc.c b/test/test/test_malloc.c
+index 5e52724194..20788011ad 100644
+--- a/test/test/test_malloc.c
++++ b/test/test/test_malloc.c
+@@ -698,4 +698,16 @@ test_malloc_bad_params(void)
@@ -55,12 +67,0 @@
-diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
-index 842eb9de75..bd5065698d 100644
---- a/lib/librte_eal/common/malloc_heap.c
-+++ b/lib/librte_eal/common/malloc_heap.c
-@@ -242,4 +242,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
- 	align = RTE_CACHE_LINE_ROUNDUP(align);
- 
-+	/* roundup might cause an overflow */
-+	if (size == 0)
-+		return NULL;
- 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
- 	if (elem != NULL) {


  parent reply	other threads:[~2020-06-05 18:26 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-05 18:23 [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' " Kevin Traynor
2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix typo in endian conversion macros' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: add i40e limitation for flow director' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flush of flow director filter' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: fix peer close check' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix memory leak for thread' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix RSS enablement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix race condition for MT unsafe service' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix identification of service running on other lcore' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: remove rte prefix from static functions' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'remove references to private PCI probe function' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' " Kevin Traynor
2020-06-05 18:24 ` Kevin Traynor [this message]
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/eventdev: fix crash on exit' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bbdev: fix doxygen comments' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/failsafe: fix fd leak' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix statistics after reset' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/netvsc: fix comment spelling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/vmbus: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/tap: fix crash in flow destroy' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix FW version query' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ring: fix device pointer on allocation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx4: fix drop queue error handling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app: remove extra new line after link duplex' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix C++17 compilation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: fix multicast filter feature announcement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix link state configuration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/vmxnet3: handle bad host framing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix port reconfiguration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix error log for command timeout' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'app/testpmd: fix DCB set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe/base: update copyright' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e/base: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: accept 32-bit domain numbers' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: reject negative values in PCI id' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'kvargs: fix strcmp helper documentation' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'fix same typo in multiple places' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix wild pointer' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix queue related exception handling' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'vhost: fix zero-copy server mode' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' " Kevin Traynor
2020-06-05 22:46   ` Thomas Monjalon
2020-06-10 14:48     ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix setting L2TAG' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/iavf: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix crash during MTU set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: add NASM installation steps' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix typo in contributors guide' " Kevin Traynor
2020-06-05 18:25 ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200605182525.22483-24-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=anatoly.burakov@intel.com \
    --cc=bingz@mellanox.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git