From: Christian Göttsche <cgzones@googlemail.com>
Date: Tue, 24 Jan 2023 14:39:41 +0000 (+0100)
Subject: Replace flawed memset_s usage
X-Git-Tag: 4.14.0-rc1~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ead3cfb8fff90f53f3dbab387e9de66b617872;p=thirdparty%2Fshadow.git

Replace flawed memset_s usage

memset_s() has a different signature than memset(3) or explicit_bzero(),
thus the current code would not compile.  Also memset_s()
implementations are quite rare.
Use the C23 standardized version memset_explicit(3).

Fixes: 7a799ebb ("Ensure memory cleaning")
---

diff --git a/configure.ac b/configure.ac
index 088a0a994..7acc33526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_CHECK_FUNCS(arc4random_buf futimes \
 	getutent initgroups lckpwdf lutimes \
 	setgroups updwtmp updwtmpx innetgr \
 	getspnam_r \
-	memset_s explicit_bzero)
+	memset_explicit explicit_bzero)
 AC_SYS_LARGEFILE
 
 dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/lib/defines.h b/lib/defines.h
index 1a25e5807..54053103a 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -47,8 +47,8 @@
 #include <sys/time.h>
 #include <time.h>
 
-#ifdef HAVE_MEMSET_S
-# define memzero(ptr, size) memset_s((ptr), 0, (size))
+#ifdef HAVE_MEMSET_EXPLICIT
+# define memzero(ptr, size) memset_explicit((ptr), 0, (size))
 #elif defined HAVE_EXPLICIT_BZERO	/* !HAVE_MEMSET_S */
 # define memzero(ptr, size) explicit_bzero((ptr), (size))
 #else					/* !HAVE_MEMSET_S && HAVE_EXPLICIT_BZERO */