From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id E75603856089; Wed, 12 Oct 2022 14:15:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E75603856089 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665584134; bh=KRQMCHImC4/OJBAVP5qdtZvjf88fnf130m7zCZRDFcg=; h=From:To:Subject:Date:From; b=ty9Fo8tMyWUag4HDiomo7H8mNScHsHwc/NUMarf5n4ZfaTNIE38C85LSFKlZmEzfn 7DjUdpKoOFqX9QA1FZDzHXW+jRcOWuhVpkZJxexnkhBD3fffWA7CkT2niVtEVSGNfU kUENJ/ShvneHkQVCue/btM2FXWUGHadCbTb1oIOw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] Fix malloc/tst-scratch_buffer X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 37cfa707b08a6d8c060d7fdebf2cc255e1de8908 X-Git-Newrev: fbc8167346207cce1c8a3217c363fdaf6d5d7f6e Message-Id: <20221012141534.E75603856089@sourceware.org> Date: Wed, 12 Oct 2022 14:15:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fbc8167346207cce1c8a3217c363fdaf6d5d7f6e commit fbc8167346207cce1c8a3217c363fdaf6d5d7f6e Author: Szabolcs Nagy Date: Tue Oct 11 13:23:25 2022 +0100 Fix malloc/tst-scratch_buffer The test used scratch_buffer_dupfree incorrectly: - The passed in size must be <= buf.length. - Must be called at most once on a buf object since it frees it. - After it is called buf.data and buf.length must not be accessed. All of these were violated, the test happened to work because the buffer was on the stack, which meant the test copied out-of-bounds bytes from the stack into a new buffer and then compared those bytes. Run one test and avoid the issues above. Diff: --- malloc/tst-scratch_buffer.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/malloc/tst-scratch_buffer.c b/malloc/tst-scratch_buffer.c index 9fcb11ba2c..60a513ccc6 100644 --- a/malloc/tst-scratch_buffer.c +++ b/malloc/tst-scratch_buffer.c @@ -155,21 +155,13 @@ do_test (void) struct scratch_buffer buf; scratch_buffer_init (&buf); memset (buf.data, '@', buf.length); - - size_t sizes[] = { 16, buf.length, buf.length + 16 }; - for (int i = 0; i < array_length (sizes); i++) - { - /* The extra size is unitialized through realloc. */ - size_t l = sizes[i] > buf.length ? sizes[i] : buf.length; - void *r = scratch_buffer_dupfree (&buf, l); - void *c = xmalloc (l); - memset (c, '@', l); - TEST_COMPARE_BLOB (r, l, buf.data, l); - free (r); - free (c); - } - - scratch_buffer_free (&buf); + size_t l = 16 <= buf.length ? 16 : buf.length; + void *r = scratch_buffer_dupfree (&buf, l); + void *c = xmalloc (l); + memset (c, '@', l); + TEST_COMPARE_BLOB (r, l, c, l); + free (r); + free (c); } return 0; }