about summary refs log tree commit diff
path: root/malloc/malloc.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-01-17 15:05:34 +0100
committerFlorian Weimer <fweimer@redhat.com>2020-01-17 15:05:34 +0100
commit768c83b7f60d82db6677e19dc51be9f341e0f3fc (patch)
treed38258b8e7d496bfde38947163597b60764ebff4 /malloc/malloc.h
parent70ba28f7ab2923d4e36ffc9d5d2e32357353b25c (diff)
downloadglibc-768c83b7f60d82db6677e19dc51be9f341e0f3fc.tar.gz
glibc-768c83b7f60d82db6677e19dc51be9f341e0f3fc.tar.xz
glibc-768c83b7f60d82db6677e19dc51be9f341e0f3fc.zip
Remove incorrect alloc_size attribute from pvalloc [BZ #25401]
pvalloc is guarantueed to round up the allocation size to the page
size, so applications can assume that the memory region is larger
than the passed-in argument.  The alloc_size attribute cannot express
that.

The test case is based on a suggestion from Jakub Jelinek.

This fixes commit 9bf8e29ca136094f73f69f725f15c51facc97206 ("malloc:
make malloc fail with requests larger than PTRDIFF_MAX (BZ#23741)").

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'malloc/malloc.h')
-rw-r--r--malloc/malloc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 0c76264421..a6903fdd54 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -71,8 +71,7 @@ extern void *valloc (size_t __size) __THROW __attribute_malloc__
 
 /* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up
    __size to nearest pagesize. */
-extern void *pvalloc (size_t __size) __THROW __attribute_malloc__
-     __attribute_alloc_size__ ((1)) __wur;
+extern void *pvalloc (size_t __size) __THROW __attribute_malloc__ __wur;
 
 /* Underlying allocation function; successive calls should return
    contiguous pieces of memory.  */