diff mbox series

Use xmalloc in tst-setcontext-fpscr.c (bug 19668)

Message ID alpine.DEB.2.20.1802012037120.13065@digraph.polyomino.org.uk
State New
Headers show
Series Use xmalloc in tst-setcontext-fpscr.c (bug 19668) | expand

Commit Message

Joseph Myers Feb. 1, 2018, 8:37 p.m. UTC 
Bug 19668 reports an unchecked malloc call in the test
sysdeps/powerpc/fpu/tst-setcontext-fpscr.c.  This patch makes that
test use xmalloc.  It does not otherwise move this test to the
support/ infrastructure or support/test-driver.c; the test has various
uses of exit and _exit on error cases, and uses atexit, and while I
think those things would all still work in the context of
test-driver.c, it's not an immediately obvious conversion the way it
would be for many tests that don't use test-driver.c.

Tested for powerpc.

2018-02-01  Joseph Myers  <joseph@codesourcery.com>

	[BZ #19668]
	* sysdeps/powerpc/fpu/tst-setcontext-fpscr.c: Include
	<support/support.h>.  Do not include <malloc.h>.
	(query_auxv): Use xmalloc instead of malloc.

Comments

Joseph Myers Feb. 6, 2018, 6:02 p.m. UTC | #1 
Ping.  This patch 
<https://sourceware.org/ml/libc-alpha/2018-02/msg00036.html> is pending 
review.
Florian Weimer Feb. 6, 2018, 6:31 p.m. UTC | #2 
On 02/01/2018 09:37 PM, Joseph Myers wrote:
> -      auxv = (ElfW(auxv_t) *)malloc(getpagesize());
> +      auxv = (ElfW(auxv_t) *) xmalloc (getpagesize ());

This is okay, but you might as well drop the cast.

Thanks,
Florian
Joseph Myers Feb. 6, 2018, 9:34 p.m. UTC | #3 
On Tue, 6 Feb 2018, Florian Weimer wrote:

> On 02/01/2018 09:37 PM, Joseph Myers wrote:
> > -      auxv = (ElfW(auxv_t) *)malloc(getpagesize());
> > +      auxv = (ElfW(auxv_t) *) xmalloc (getpagesize ());
> 
> This is okay, but you might as well drop the cast.

Done.
diff mbox series

Patch

diff --git a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
index c64ca88..f39f1c4 100644
--- a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
+++ b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c
@@ -23,11 +23,11 @@ 
 #include <string.h>
 #include <ucontext.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <link.h>
 #include <elf.h>
 #include <fpu_control.h>
 #include <sys/auxv.h>
+#include <support/support.h>
 
 static ucontext_t ctx[3];
 
@@ -59,7 +59,7 @@  ElfW(Addr) query_auxv(int type)
 	  perror("Error opening file for reading");
 	  return 0;
 	}
-      auxv = (ElfW(auxv_t) *)malloc(getpagesize());
+      auxv = (ElfW(auxv_t) *) xmalloc (getpagesize ());
 
       do
 	{