diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2019-04-28 18:59:18 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2019-05-09 19:37:40 +0000 |
| commit | a547acf91a502e2d79ff67ef86d1b791883ca43a (patch) | |
| tree | c2a1e3e2d22fbbc1fa8edcdb668712a6b3d3740a /usr/src/lib/libc | |
| parent | f26364c965228a50041eda19745fc8573312c654 (diff) | |
| download | illumos-joyent-a547acf91a502e2d79ff67ef86d1b791883ca43a.tar.gz | |
10880 posix_memalign() should avoid clobbering return parameter on failure
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/gen/posix_memalign.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/usr/src/lib/libc/port/gen/posix_memalign.c b/usr/src/lib/libc/port/gen/posix_memalign.c index d05ac2d9ea..131e0d01b8 100644 --- a/usr/src/lib/libc/port/gen/posix_memalign.c +++ b/usr/src/lib/libc/port/gen/posix_memalign.c @@ -24,9 +24,10 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" + +#include <sys/sysmacros.h> + #include <stdlib.h> #include <errno.h> @@ -49,16 +50,19 @@ int posix_memalign(void **memptr, size_t alignment, size_t size) { void *ptr = NULL; - int error = 0; - - if (alignment == 0 || - (alignment & (sizeof (void *) - 1)) != 0 || - (alignment & (alignment - 1)) != 0) - error = EINVAL; - else if (size != 0 && - (ptr = memalign(alignment, size)) == NULL) - error = ENOMEM; - *memptr = ptr; - return (error); + if ((alignment == 0) || !ISP2(alignment) || + (alignment & (sizeof (void *) - 1)) != 0) { + return (EINVAL); + } else if (size == 0) { + *memptr = NULL; + return (0); + } else { + if ((ptr = memalign(alignment, size)) == NULL) { + return (ENOMEM); + } else { + *memptr = ptr; + return (0); + } + } } |