[PATCH 2/2] malloc: Add tst-aligned_alloc.

[Will Newton <will dot newton at linaro dot org>]

Add a test for aligned_alloc. The test is largely the same as the
test for memalign but with an extra test for the restrictions on the
SIZE argument to aligned_alloc.

ChangeLog:

2013-11-07  Will Newton  <will.newton@linaro.org>

	* malloc/Makefile (tests): Add tst-aligned_alloc.
	* malloc/tst-aligned_alloc.c: New file.
---
 malloc/Makefile            |   2 +-
 malloc/tst-aligned_alloc.c | 127 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 malloc/tst-aligned_alloc.c

diff --git a/malloc/Makefile b/malloc/Makefile
index 84339d1..39eacb4 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -27,7 +27,7 @@ headers := $(dist-headers) obstack.h mcheck.h
 tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
 	 tst-mallocstate tst-mcheck tst-mallocfork tst-trim1 \
 	 tst-malloc-usable tst-realloc tst-posix_memalign \
-	 tst-pvalloc tst-memalign
+	 tst-pvalloc tst-memalign tst-aligned_alloc
 test-srcs = tst-mtrace

 routines = malloc morecore mcheck mtrace obstack
diff --git a/malloc/tst-aligned_alloc.c b/malloc/tst-aligned_alloc.c
new file mode 100644
index 0000000..34ceefe
--- /dev/null
+++ b/malloc/tst-aligned_alloc.c
@@ -0,0 +1,127 @@
+/* Test for aligned_alloc.
+   Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static int errors = 0;
+
+static void
+merror (const char *msg)
+{
+  ++errors;
+  printf ("Error: %s\n", msg);
+}
+
+static int
+do_test (void)
+{
+  void *p;
+  unsigned long pagesize = getpagesize ();
+  unsigned long ptrval;
+  int save;
+
+  errno = 0;
+
+  /* An attempt to allocate a huge value should return NULL and set
+     errno to ENOMEM.  */
+  p = aligned_alloc (sizeof (void *), -1);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("aligned_alloc (sizeof (void *), -1) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("aligned_alloc (sizeof (void *), -1) errno is not set correctly");
+
+  free (p);
+
+  errno = 0;
+
+  /* Test to expose integer overflow in malloc internals from BZ #15857.  */
+  p = aligned_alloc (pagesize, -pagesize);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("aligned_alloc (pagesize, -pagesize) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("aligned_alloc (pagesize, -pagesize) errno is not set correctly");
+
+  free (p);
+
+  errno = 0;
+
+  /* Test to expose integer overflow in malloc internals from BZ #16038.  */
+  p = aligned_alloc (-1, pagesize);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("aligned_alloc (-1, pagesize) succeeded.");
+
+  if (p == NULL && save != EINVAL)
+    merror ("aligned_alloc (-1, pagesize) errno is not set correctly");
+
+  free (p);
+
+  /* aligned_alloc requires that size is a multiple of alignment.  */
+  p = aligned_alloc (0x100, 10);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("aligned_alloc (0x100, 10) succeeded.");
+
+  if (p == NULL && save != EINVAL)
+    merror ("aligned_alloc (0x100, 10) errno is not set correctly");
+
+  free (p);
+
+  /* A zero-sized allocation should succeed with glibc, returning a
+     non-NULL value.  */
+  p = aligned_alloc (sizeof (void *), 0);
+
+  if (p == NULL)
+    merror ("aligned_alloc (sizeof (void *), 0) failed.");
+
+  free (p);
+
+  /* Check the alignment of the returned pointer is correct.  */
+  p = aligned_alloc (0x100, 0x200);
+
+  if (p == NULL)
+    merror ("aligned_alloc (0x100, 0x200) failed.");
+
+  ptrval = (unsigned long) p;
+
+  if ((ptrval & 0xff) != 0)
+    merror ("pointer is not aligned to 0x100");
+
+  free (p);
+
+  return errors != 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
-- 
1.8.1.4