shadow-maint · alejandro-colomar · Jul 29, 2026 · Jan 10, 2026 · Jan 10, 2026 · Jul 31, 2026
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -29,14 +29,8 @@ libshadow_la_SOURCES = \
 	age.c \
 	agetpass.c \
 	agetpass.h \
-	alloc/calloc.c \
-	alloc/calloc.h \
-	alloc/malloc.c \
-	alloc/malloc.h \
-	alloc/realloc.c \
-	alloc/realloc.h \
-	alloc/reallocf.c \
-	alloc/reallocf.h \
+	alloc/alloc.c \
+	alloc/alloc.h \
 	atoi/a2i.c \
 	atoi/a2i.h \
 	atoi/getnum.c \

diff --git a/lib/addgrps.c b/lib/addgrps.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "alloc/reallocf.h"
+#include "alloc/alloc.h"
 #include "io/fprintf.h"
 #include "search/l/lsearch.h"
 #include "shadow/grp/agetgroups.h"

diff --git a/lib/agetpass.c b/lib/agetpass.c
@@ -16,7 +16,7 @@
 
 #ident "$Id$"
 
-#include "alloc/malloc.h"
+#include "alloc/alloc.h"
 
 #if WITH_LIBBSD == 0
 #include "freezero.h"

diff --git a/lib/alloc/alloc.c b/lib/alloc/alloc.c
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2023-2026, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include "config.h"
+
+#include "alloc/alloc.h"
+
+#include <stddef.h>
+
+
+extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
diff --git a/lib/alloc/alloc.h b/lib/alloc/alloc.h
@@ -0,0 +1,72 @@
+// SPDX-FileCopyrightText: 2023-2026, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_ALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_ALLOC_H_
+
+
+#include "config.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "cast.h"
+#include "exit_if_null.h"
+#include "sizeof.h"
+
+
+// malloc_T - malloc type-safe
+#define malloc_T(n, T)      rvalue((typeas(T) *){mallocarray(n, sizeof(T))})
+// calloc_T - calloc type-safe
+#define calloc_T(n, T)      rvalue((typeas(T) *){calloc(n, sizeof(T))})
+// realloc_T - realloc type-safe
+#define realloc_T(p, n, T)                                            \
+(                                                                     \
+	_Generic(p, typeas(T) *: (void)0),                            \
+	rvalue((typeas(T) *){reallocarray_(p, n, sizeof(T))})         \
+)
+// reallocf_T - realloc free-on-error type-safe
+#define reallocf_T(p, n, T)                                           \
+(                                                                     \
+	_Generic(p, typeas(T) *: (void)0),                            \
+	rvalue((typeas(T) *){reallocarrayf_(p, n, sizeof(T))})        \
+)
+
+
+// xmalloc_T - exit-on-error malloc type-safe
+#define xmalloc_T(n, T)      exit_if_null(malloc_T(n, T))
+// xcalloc_T - exit-on-error calloc type-safe
+#define xcalloc_T(n, T)      exit_if_null(calloc_T(n, T))
+// xrealloc_T - exit-on-error realloc type-safe
+#define xrealloc_T(p, n, T)  exit_if_null(realloc_T(p, n, T))
+
+
+// mallocarray - malloc array
+#define mallocarray(...)  reallocarray(NULL, __VA_ARGS__)
+
+
+#define reallocarray_(p, n, size)   reallocarray(p, (n) ?: 1, (size) ?: 1)
+#define reallocarrayf_(p, n, size)  reallocarrayf(p, (n) ?: 1, (size) ?: 1)
+
+
+// reallocarrayf - realloc array free-on-error
+ATTR_ALLOC_SIZE(2, 3)
+ATTR_MALLOC(free)
+inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
+
+
+inline void *
+reallocarrayf(void *p, size_t nmemb, size_t size)
+{
+	void  *q;
+
+	q = reallocarray(p, nmemb ?: 1, size ?: 1);
+
+	if (q == NULL)
+		free(p);
+	return q;
+}
+
+
+#endif  // include guard
diff --git a/lib/alloc/calloc.c b/lib/alloc/calloc.c
diff --git a/lib/alloc/calloc.h b/lib/alloc/calloc.h
diff --git a/lib/alloc/malloc.c b/lib/alloc/malloc.c
diff --git a/lib/alloc/malloc.h b/lib/alloc/malloc.h
diff --git a/lib/alloc/realloc.c b/lib/alloc/realloc.c
diff --git a/lib/alloc/realloc.h b/lib/alloc/realloc.h
diff --git a/lib/alloc/reallocf.c b/lib/alloc/reallocf.c
diff --git a/lib/alloc/reallocf.h b/lib/alloc/reallocf.h
diff --git a/lib/cast.h b/lib/cast.h
@@ -11,5 +11,7 @@
 
 #define const_cast(T, p)  _Generic(p, const T:  (T) (p))
 
+#define rvalue(lv)        ((void)0, (lv))
+
 
 #endif  // include guard
diff --git a/lib/commonio.c b/lib/commonio.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <utime.h>
 
-#include "alloc/malloc.h"
+#include "alloc/alloc.h"
 #include "atoi/getnum.h"
 #include "commonio.h"
 #include "defines.h"

diff --git a/lib/copydir.c b/lib/copydir.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "alloc/malloc.h"
+#include "alloc/alloc.h"
 #include "attr.h"
 #include "fs/readlink/areadlink.h"
 #include "io/fprintf.h"

diff --git a/lib/env.c b/lib/env.c
@@ -13,8 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "alloc/malloc.h"
-#include "alloc/realloc.h"
+#include "alloc/alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "shadowlog.h"

diff --git a/lib/find_new_gid.c b/lib/find_new_gid.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "alloc/calloc.h"
+#include "alloc/alloc.h"
 #include "groupio.h"
 #include "getdef.h"
 #include "io/fprintf.h"

diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "alloc/calloc.h"
+#include "alloc/alloc.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "getdef.h"

diff --git a/lib/fs/readlink/areadlink.h b/lib/fs/readlink/areadlink.h
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 
 #include "defines.h"
-#include "alloc/malloc.h"
+#include "alloc/alloc.h"
 #include "attr.h"
 #include "fs/readlink/readlinknul.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,7 @@

		#define const_cast(T, p) _Generic(p, const T: (T) (p))

		#define rvalue(lv) ((void)0, (lv))


		#endif // include guard