Implement reallocarray()
Stateless and I stumbled upon this issue while discussing the semantics of read, accepting a size_t but only being able to return ssize_t, effectively lacking the ability to report successful reads > SSIZE_MAX. The discussion went along and we came to the topic of input-based memory allocations. Basically, it was possible for the argument to a memory-allocation-function to overflow, leading to a segfault later. The OpenBSD-guys came up with the ingenious reallocarray-function, and I implemented it as ereallocarray, which automatically returns on error. Read more about it here[0]. A simple testcase is this (courtesy to stateless): $ sbase-strings -n (2^(32|64) / 4) This will segfault before this patch and properly return an OOM- situation afterwards (thanks to the overflow-check in reallocarray). [0]: http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/calloc.3
This commit is contained in:
		
							
								
								
									
										51
									
								
								libutil/reallocarray.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								libutil/reallocarray.c
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | ||||
| /*	$OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $	*/ | ||||
| /* | ||||
|  * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | ||||
|  * | ||||
|  * Permission to use, copy, modify, and distribute this software for any | ||||
|  * purpose with or without fee is hereby granted, provided that the above | ||||
|  * copyright notice and this permission notice appear in all copies. | ||||
|  * | ||||
|  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||||
|  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||||
|  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||||
|  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||||
|  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||||
|  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||||
|  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||||
|  */ | ||||
|  | ||||
| #include <sys/types.h> | ||||
| #include <errno.h> | ||||
| #include <stdint.h> | ||||
| #include <stdlib.h> | ||||
|  | ||||
| #include "../util.h" | ||||
|  | ||||
| /* | ||||
|  * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX | ||||
|  * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW | ||||
|  */ | ||||
| #define MUL_NO_OVERFLOW	(1UL << (sizeof(size_t) * 4)) | ||||
|  | ||||
| void * | ||||
| reallocarray(void *optr, size_t nmemb, size_t size) | ||||
| { | ||||
| 	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && | ||||
| 	    nmemb > 0 && SIZE_MAX / nmemb < size) { | ||||
| 		errno = ENOMEM; | ||||
| 		return NULL; | ||||
| 	} | ||||
| 	return realloc(optr, size * nmemb); | ||||
| } | ||||
|  | ||||
| void * | ||||
| ereallocarray(void *optr, size_t nmemb, size_t size) | ||||
| { | ||||
| 	void *p; | ||||
|  | ||||
| 	if (!(p = reallocarray(optr, nmemb, size))) | ||||
| 		eprintf("reallocarray: out of memory\n"); | ||||
|  | ||||
| 	return p; | ||||
| } | ||||
		Reference in New Issue
	
	Block a user