mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 08:11:08 +00:00
dynarray: Set errno on overflow-induced allocation failure
This allows the caller to return directly on such an error, with an appropriate errno value.
This commit is contained in:
parent
a9da0bb266
commit
5898f4548e
@ -1,3 +1,11 @@
|
|||||||
|
2017-08-30 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
|
* malloc/dynarray_emplace_enlarge.c
|
||||||
|
(__libc_dynarray_emplace_enlarge): Set errno on overflow.
|
||||||
|
* malloc/dynarray_resize.c (__libc_dynarray_resize): Likewise.
|
||||||
|
* malloc/tst-dynarray.c (test_long_overflow): New function.
|
||||||
|
(do_test): Call it.
|
||||||
|
|
||||||
2017-08-30 Florian Weimer <fweimer@redhat.com>
|
2017-08-30 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
* malloc/malloc.c (ARENA_CORRUPTION_BIT, arena_is_corrupt)
|
* malloc/malloc.c (ARENA_CORRUPTION_BIT, arena_is_corrupt)
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
#include <dynarray.h>
|
#include <dynarray.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <malloc-internal.h>
|
#include <malloc-internal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -43,9 +44,12 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
|
|||||||
{
|
{
|
||||||
new_allocated = list->allocated + list->allocated / 2 + 1;
|
new_allocated = list->allocated + list->allocated / 2 + 1;
|
||||||
if (new_allocated <= list->allocated)
|
if (new_allocated <= list->allocated)
|
||||||
|
{
|
||||||
/* Overflow. */
|
/* Overflow. */
|
||||||
|
__set_errno (ENOMEM);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
size_t new_size;
|
size_t new_size;
|
||||||
if (check_mul_overflow_size_t (new_allocated, element_size, &new_size))
|
if (check_mul_overflow_size_t (new_allocated, element_size, &new_size))
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
#include <dynarray.h>
|
#include <dynarray.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <malloc-internal.h>
|
#include <malloc-internal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -38,7 +39,11 @@ __libc_dynarray_resize (struct dynarray_header *list, size_t size,
|
|||||||
|
|
||||||
size_t new_size_bytes;
|
size_t new_size_bytes;
|
||||||
if (check_mul_overflow_size_t (size, element_size, &new_size_bytes))
|
if (check_mul_overflow_size_t (size, element_size, &new_size_bytes))
|
||||||
|
{
|
||||||
|
/* Overflow. */
|
||||||
|
__set_errno (ENOMEM);
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
void *new_array;
|
void *new_array;
|
||||||
if (list->array == scratch)
|
if (list->array == scratch)
|
||||||
{
|
{
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
|
|
||||||
#include "tst-dynarray-shared.h"
|
#include "tst-dynarray-shared.h"
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
#define DYNARRAY_STRUCT dynarray_long
|
#define DYNARRAY_STRUCT dynarray_long
|
||||||
#define DYNARRAY_ELEMENT long
|
#define DYNARRAY_ELEMENT long
|
||||||
#define DYNARRAY_PREFIX dynarray_long_
|
#define DYNARRAY_PREFIX dynarray_long_
|
||||||
@ -463,6 +466,31 @@ test_long_init (void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Test overflow in resize. */
|
||||||
|
static void
|
||||||
|
test_long_overflow (void)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
struct dynarray_long dyn;
|
||||||
|
dynarray_long_init (&dyn);
|
||||||
|
errno = EINVAL;
|
||||||
|
TEST_VERIFY (!dynarray_long_resize
|
||||||
|
(&dyn, (SIZE_MAX / sizeof (long)) + 1));
|
||||||
|
TEST_VERIFY (errno == ENOMEM);
|
||||||
|
TEST_VERIFY (dynarray_long_has_failed (&dyn));
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
struct dynarray_long_noscratch dyn;
|
||||||
|
dynarray_long_noscratch_init (&dyn);
|
||||||
|
errno = EINVAL;
|
||||||
|
TEST_VERIFY (!dynarray_long_noscratch_resize
|
||||||
|
(&dyn, (SIZE_MAX / sizeof (long)) + 1));
|
||||||
|
TEST_VERIFY (errno == ENOMEM);
|
||||||
|
TEST_VERIFY (dynarray_long_noscratch_has_failed (&dyn));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Test NUL-terminated string construction with the add function and
|
/* Test NUL-terminated string construction with the add function and
|
||||||
the simple finalize function. */
|
the simple finalize function. */
|
||||||
static void
|
static void
|
||||||
@ -538,6 +566,7 @@ do_test (void)
|
|||||||
test_int ();
|
test_int ();
|
||||||
test_str ();
|
test_str ();
|
||||||
test_long_init ();
|
test_long_init ();
|
||||||
|
test_long_overflow ();
|
||||||
test_zstr ();
|
test_zstr ();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user