aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-09-26 15:38:19 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2023-10-04 08:33:20 +0100
commit0a520f28ffc8820d46074a71323db4c9652873be (patch)
tree7774d06cb34d9c71f2d03922f35e9779e26939d6
parent1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (diff)
downloadglibc-0a520f28ffc8820d46074a71323db4c9652873be.zip
glibc-0a520f28ffc8820d46074a71323db4c9652873be.tar.gz
glibc-0a520f28ffc8820d46074a71323db4c9652873be.tar.bz2
Fix off-by-one OOB write in iconv/tst-iconv-mt
The iconv buffer sizes must not include the \0 string terminator. And the output termination with *outbufpos = '\0' was OOB. Consistently use non-null-terminated buffer sizes. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--iconv/tst-iconv-mt.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/iconv/tst-iconv-mt.c b/iconv/tst-iconv-mt.c
index e634eec..8d7867b 100644
--- a/iconv/tst-iconv-mt.c
+++ b/iconv/tst-iconv-mt.c
@@ -57,12 +57,13 @@ worker (void * arg)
iconv_t cd;
char ascii[] = CONV_INPUT;
+ size_t bytes = sizeof (CONV_INPUT) - 1;
char *inbufpos = ascii;
- size_t inbytesleft = sizeof (CONV_INPUT);
+ size_t inbytesleft = bytes;
- char *utf8 = xcalloc (sizeof (CONV_INPUT), 1);
+ char *utf8 = xcalloc (bytes, 1);
char *outbufpos = utf8;
- size_t outbytesleft = sizeof (CONV_INPUT);
+ size_t outbytesleft = bytes;
if (tidx < TCOUNT/2)
/* The first half of the worker thread pool synchronize together here,
@@ -91,8 +92,6 @@ worker (void * arg)
&outbytesleft)
!= (size_t) -1);
- *outbufpos = '\0';
-
xpthread_barrier_wait (&sync);
TEST_VERIFY_EXIT (iconv_close (cd) == 0);
@@ -104,11 +103,7 @@ worker (void * arg)
if (tidx < TCOUNT/2)
xpthread_barrier_wait (&sync);
- if (strncmp (utf8, CONV_INPUT, sizeof CONV_INPUT))
- {
- printf ("FAIL: thread %lx: invalid conversion output from iconv\n", tidx);
- pthread_exit ((void *) (long int) 1);
- }
+ TEST_COMPARE_BLOB (utf8, bytes, CONV_INPUT, bytes);
pthread_exit (NULL);
}