summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
baf6a69)
(pagealign_alloc): Set var to const as possible.
Check for MAP_FAILED return from mmap. Set errno on failure of
posix_memalign(). Catch munmap failure.
{
void *ret;
#if HAVE_MMAP
{
void *ret;
#if HAVE_MMAP
# ifdef HAVE_MAP_ANONYMOUS
const int fd = -1;
# ifdef HAVE_MAP_ANONYMOUS
const int fd = -1;
- flags = MAP_ANONYMOUS | MAP_PRIVATE;
+ const int flags = MAP_ANONYMOUS | MAP_PRIVATE;
# else /* !HAVE_MAP_ANONYMOUS */
static int fd = -1; /* Only open /dev/zero once in order to avoid limiting
the amount of memory we may allocate based on the
number of open file descriptors. */
# else /* !HAVE_MAP_ANONYMOUS */
static int fd = -1; /* Only open /dev/zero once in order to avoid limiting
the amount of memory we may allocate based on the
number of open file descriptors. */
- flags = MAP_FILE | MAP_PRIVATE;
+ const int flags = MAP_FILE | MAP_PRIVATE;
if (fd == -1)
{
fd = open ("/dev/zero", O_RDONLY, 0666);
if (fd == -1)
{
fd = open ("/dev/zero", O_RDONLY, 0666);
}
# endif /* HAVE_MAP_ANONYMOUS */
ret = mmap (NULL, size, PROT_READ | PROT_WRITE, flags, fd, 0);
}
# endif /* HAVE_MAP_ANONYMOUS */
ret = mmap (NULL, size, PROT_READ | PROT_WRITE, flags, fd, 0);
return NULL;
new_memnode (ret, size);
#elif HAVE_POSIX_MEMALIGN
int status = posix_memalign (&ret, getpagesize (), size);
if (status)
return NULL;
new_memnode (ret, size);
#elif HAVE_POSIX_MEMALIGN
int status = posix_memalign (&ret, getpagesize (), size);
if (status)
+ {
+ errno = status;
+ return NULL;
+ }
#else /* !HAVE_MMAP && !HAVE_POSIX_MEMALIGN */
size_t pagesize = getpagesize ();
void *unaligned_ptr = malloc (size + pagesize - 1);
#else /* !HAVE_MMAP && !HAVE_POSIX_MEMALIGN */
size_t pagesize = getpagesize ();
void *unaligned_ptr = malloc (size + pagesize - 1);
pagealign_free (void *aligned_ptr)
{
#if HAVE_MMAP
pagealign_free (void *aligned_ptr)
{
#if HAVE_MMAP
- munmap (aligned_ptr, get_memnode (aligned_ptr));
+ if (munmap (aligned_ptr, get_memnode (aligned_ptr)) < 0)
+ error (EXIT_FAILURE, errno, "Failed to unmap memory");
#elif HAVE_POSIX_MEMALIGN
free (aligned_ptr);
#else
#elif HAVE_POSIX_MEMALIGN
free (aligned_ptr);
#else