[v3] malloc: Add memalign test.

Message ID 524D61D4.2040001@linaro.org
State Accepted
Headers show

Commit Message

Will Newton Oct. 3, 2013, 12:23 p.m.
ChangeLog:

2013-08-16  Will Newton  <will.newton@linaro.org>

    * malloc/Makefile: Add tst-memalign.
    * malloc/tst-memalign.c: New file.
---
 malloc/Makefile       |  2 +-
 malloc/tst-memalign.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 malloc/tst-memalign.c

Changes in v3:
 - Add comments
 - Add calls to free
 - Coding style

Comments

Carlos O'Donell Oct. 3, 2013, 8:57 p.m. | #1
On 10/03/2013 08:23 AM, Will Newton wrote:
> 
> ChangeLog:
> 
> 2013-08-16  Will Newton  <will.newton@linaro.org>
> 
>     * malloc/Makefile: Add tst-memalign.
>     * malloc/tst-memalign.c: New file.

v3 looks good to me. Thanks!

> ---
>  malloc/Makefile       |  2 +-
>  malloc/tst-memalign.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 100 insertions(+), 1 deletion(-)
>  create mode 100644 malloc/tst-memalign.c
> 
> Changes in v3:
>  - Add comments
>  - Add calls to free
>  - Coding style
> 
> diff --git a/malloc/Makefile b/malloc/Makefile
> index 17d146b..d482879 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-pvalloc tst-memalign
>  test-srcs = tst-mtrace
> 
>  routines = malloc morecore mcheck mtrace obstack
> diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c
> new file mode 100644
> index 0000000..ca90507
> --- /dev/null
> +++ b/malloc/tst-memalign.c
> @@ -0,0 +1,99 @@
> +/* Test for memalign.
> +   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 <malloc.h>
> +#include <stdio.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 = memalign (sizeof (void *), -1);
> +
> +  save = errno;
> +
> +  if (p != NULL)
> +    merror ("memalign (sizeof (void *), -1) succeeded.");
> +
> +  if (p == NULL && save != ENOMEM)
> +    merror ("memalign (sizeof (void *), -1) errno is not set correctly");
> +
> +  free (p);
> +
> +  errno = 0;
> +
> +  /* Test to expose integer overflow in malloc internals from BZ #15857.  */
> +  p = memalign (pagesize, -pagesize);
> +
> +  save = errno;
> +
> +  if (p != NULL)
> +    merror ("memalign (pagesize, -pagesize) succeeded.");
> +
> +  if (p == NULL && save != ENOMEM)
> +    merror ("memalign (pagesize, -pagesize) errno is not set correctly");
> +
> +  free (p);
> +
> +  /* A zero-sized allocation should succeed with glibc, returning a
> +     non-NULL value.  */
> +  p = memalign (sizeof (void *), 0);
> +
> +  if (p == NULL)
> +    merror ("memalign (sizeof (void *), 0) failed.");
> +
> +  free (p);
> +
> +  /* Check the alignment of the returned pointer is correct.  */
> +  p = memalign (0x100, 10);
> +
> +  if (p == NULL)
> +    merror ("memalign (0x100, 10) 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"
>
Ondřej Bílka Oct. 4, 2013, 6:39 a.m. | #2
On Thu, Oct 03, 2013 at 01:23:48PM +0100, Will Newton wrote:

> +static int
> +do_test (void)
> +{
> +  void *p;
> +  unsigned long pagesize = getpagesize();
missing space
Will Newton Oct. 4, 2013, 8:18 a.m. | #3
On 4 October 2013 07:39, Ondřej Bílka <neleai@seznam.cz> wrote:
> On Thu, Oct 03, 2013 at 01:23:48PM +0100, Will Newton wrote:
>
>> +static int
>> +do_test (void)
>> +{
>> +  void *p;
>> +  unsigned long pagesize = getpagesize();
> missing space

Thanks. I applied the patches with this change.

Patch

diff --git a/malloc/Makefile b/malloc/Makefile
index 17d146b..d482879 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-pvalloc tst-memalign
 test-srcs = tst-mtrace

 routines = malloc morecore mcheck mtrace obstack
diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c
new file mode 100644
index 0000000..ca90507
--- /dev/null
+++ b/malloc/tst-memalign.c
@@ -0,0 +1,99 @@ 
+/* Test for memalign.
+   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 <malloc.h>
+#include <stdio.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 = memalign (sizeof (void *), -1);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("memalign (sizeof (void *), -1) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("memalign (sizeof (void *), -1) errno is not set correctly");
+
+  free (p);
+
+  errno = 0;
+
+  /* Test to expose integer overflow in malloc internals from BZ #15857.  */
+  p = memalign (pagesize, -pagesize);
+
+  save = errno;
+
+  if (p != NULL)
+    merror ("memalign (pagesize, -pagesize) succeeded.");
+
+  if (p == NULL && save != ENOMEM)
+    merror ("memalign (pagesize, -pagesize) errno is not set correctly");
+
+  free (p);
+
+  /* A zero-sized allocation should succeed with glibc, returning a
+     non-NULL value.  */
+  p = memalign (sizeof (void *), 0);
+
+  if (p == NULL)
+    merror ("memalign (sizeof (void *), 0) failed.");
+
+  free (p);
+
+  /* Check the alignment of the returned pointer is correct.  */
+  p = memalign (0x100, 10);
+
+  if (p == NULL)
+    merror ("memalign (0x100, 10) 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"