3afa87d11b
upstream patch that supports -D_FORTIFY_SOURCE=3. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/jemalloc?expand=0&rev=85
74 lines
2.0 KiB
Diff
74 lines
2.0 KiB
Diff
From ed5fc14b28ca62a6ba57b65adf557e1ef09037f0 Mon Sep 17 00:00:00 2001
|
|
From: Qi Wang <interwq@gwu.edu>
|
|
Date: Wed, 23 Mar 2022 16:31:40 -0700
|
|
Subject: [PATCH] Use volatile to workaround buffer overflow false positives.
|
|
|
|
In test/integration/rallocx, full usable size is checked which may confuse
|
|
overflow detection.
|
|
---
|
|
test/integration/rallocx.c | 26 +++++++++++++++++++++-----
|
|
1 file changed, 21 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c
|
|
index d4a48fce..68b8f381 100644
|
|
--- a/test/integration/rallocx.c
|
|
+++ b/test/integration/rallocx.c
|
|
@@ -41,7 +41,11 @@ get_large_size(size_t ind) {
|
|
}
|
|
|
|
TEST_BEGIN(test_grow_and_shrink) {
|
|
- void *p, *q;
|
|
+ /*
|
|
+ * Use volatile to workaround buffer overflow false positives
|
|
+ * (-D_FORTIFY_SOURCE=3).
|
|
+ */
|
|
+ void *volatile p, *volatile q;
|
|
size_t tsz;
|
|
#define NCYCLES 3
|
|
unsigned i, j;
|
|
@@ -85,9 +89,13 @@ TEST_BEGIN(test_grow_and_shrink) {
|
|
TEST_END
|
|
|
|
static bool
|
|
-validate_fill(const void *p, uint8_t c, size_t offset, size_t len) {
|
|
+validate_fill(void *p, uint8_t c, size_t offset, size_t len) {
|
|
bool ret = false;
|
|
- const uint8_t *buf = (const uint8_t *)p;
|
|
+ /*
|
|
+ * Use volatile to workaround buffer overflow false positives
|
|
+ * (-D_FORTIFY_SOURCE=3).
|
|
+ */
|
|
+ uint8_t *volatile buf = (uint8_t *)p;
|
|
size_t i;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
@@ -104,7 +112,11 @@ validate_fill(const void *p, uint8_t c, size_t offset, size_t len) {
|
|
}
|
|
|
|
TEST_BEGIN(test_zero) {
|
|
- void *p, *q;
|
|
+ /*
|
|
+ * Use volatile to workaround buffer overflow false positives
|
|
+ * (-D_FORTIFY_SOURCE=3).
|
|
+ */
|
|
+ void *volatile p, *volatile q;
|
|
size_t psz, qsz, i, j;
|
|
size_t start_sizes[] = {1, 3*1024, 63*1024, 4095*1024};
|
|
#define FILL_BYTE 0xaaU
|
|
@@ -205,7 +217,11 @@ TEST_BEGIN(test_align_enum) {
|
|
TEST_END
|
|
|
|
TEST_BEGIN(test_lg_align_and_zero) {
|
|
- void *p, *q;
|
|
+ /*
|
|
+ * Use volatile to workaround buffer overflow false positives
|
|
+ * (-D_FORTIFY_SOURCE=3).
|
|
+ */
|
|
+ void *volatile p, *volatile q;
|
|
unsigned lg_align;
|
|
size_t sz;
|
|
#define MAX_LG_ALIGN 25
|
|
--
|
|
2.35.1
|
|
|