|
 |
88c8c8 |
From f73ad90e797824569008a054bea6c8215883a3a0 Mon Sep 17 00:00:00 2001
|
|
|
88c8c8 |
From: Christos Zoulas <christos@zoulas.com>
|
|
|
88c8c8 |
Date: Mon, 26 Aug 2019 14:31:39 +0000
|
|
|
88c8c8 |
Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz)
|
|
|
88c8c8 |
|
|
|
88c8c8 |
Upstream-commit: 46a8443f76cec4b41ec736eca396984c74664f84
|
|
|
88c8c8 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
88c8c8 |
---
|
|
|
88c8c8 |
src/cdf.c | 7 +++----
|
|
|
88c8c8 |
src/cdf.h | 1 +
|
|
|
88c8c8 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
88c8c8 |
|
|
|
88c8c8 |
diff --git a/src/cdf.c b/src/cdf.c
|
|
|
88c8c8 |
index 556a3ff..8bb0a6d 100644
|
|
|
88c8c8 |
--- a/src/cdf.c
|
|
|
88c8c8 |
+++ b/src/cdf.c
|
|
|
88c8c8 |
@@ -1013,8 +1013,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
|
|
|
88c8c8 |
goto out;
|
|
|
88c8c8 |
}
|
|
|
88c8c8 |
nelements = CDF_GETUINT32(q, 1);
|
|
|
88c8c8 |
- if (nelements == 0) {
|
|
|
88c8c8 |
- DPRINTF(("CDF_VECTOR with nelements == 0\n"));
|
|
|
88c8c8 |
+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
|
|
|
88c8c8 |
+ DPRINTF(("CDF_VECTOR with nelements == %"
|
|
|
88c8c8 |
+ SIZE_T_FORMAT "u\n", nelements));
|
|
|
88c8c8 |
goto out;
|
|
|
88c8c8 |
}
|
|
|
88c8c8 |
slen = 2;
|
|
|
88c8c8 |
@@ -1056,8 +1057,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
|
|
|
88c8c8 |
goto out;
|
|
|
88c8c8 |
inp += nelem;
|
|
|
88c8c8 |
}
|
|
|
88c8c8 |
- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
|
|
|
88c8c8 |
- nelements));
|
|
|
88c8c8 |
for (j = 0; j < nelements && i < sh.sh_properties;
|
|
|
88c8c8 |
j++, i++)
|
|
|
88c8c8 |
{
|
|
|
88c8c8 |
diff --git a/src/cdf.h b/src/cdf.h
|
|
|
88c8c8 |
index 2f7e554..0505666 100644
|
|
|
88c8c8 |
--- a/src/cdf.h
|
|
|
88c8c8 |
+++ b/src/cdf.h
|
|
|
88c8c8 |
@@ -48,6 +48,7 @@
|
|
|
88c8c8 |
typedef int32_t cdf_secid_t;
|
|
|
88c8c8 |
|
|
|
88c8c8 |
#define CDF_LOOP_LIMIT 10000
|
|
|
88c8c8 |
+#define CDF_ELEMENT_LIMIT 100000
|
|
|
88c8c8 |
|
|
|
88c8c8 |
#define CDF_SECID_NULL 0
|
|
|
88c8c8 |
#define CDF_SECID_FREE -1
|
|
|
88c8c8 |
--
|
|
|
88c8c8 |
2.20.1
|
|
|
88c8c8 |
|