Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Mon, 15 Aug 2022 15:21:10 -0300
From: √Črico Nogueira <ericonr@...root.org>
To: musl@...ts.openwall.com
Cc: √Črico Nogueira <ericonr@...root.org>
Subject: [PATCH] use __getauxval in mallocng

saves around 20 bytes of .text
---
 src/malloc/mallocng/glue.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/malloc/mallocng/glue.h b/src/malloc/mallocng/glue.h
index 151c48b8..4b988fb2 100644
--- a/src/malloc/mallocng/glue.h
+++ b/src/malloc/mallocng/glue.h
@@ -12,6 +12,7 @@
 #include "libc.h"
 #include "lock.h"
 #include "dynlink.h"
+#include "sys/auxv.h"
 
 // use macros to appropriately namespace these.
 #define size_classes __malloc_size_classes
@@ -42,9 +43,8 @@
 static inline uint64_t get_random_secret()
 {
 	uint64_t secret = (uintptr_t)&secret * 1103515245;
-	for (size_t i=0; libc.auxv[i]; i+=2)
-		if (libc.auxv[i]==AT_RANDOM)
-			memcpy(&secret, (char *)libc.auxv[i+1]+8, sizeof secret);
+	const char *at_random = (void *)__getauxval(AT_RANDOM);
+	if (at_random) memcpy(&secret, at_random+8, sizeof secret);
 	return secret;
 }
 
-- 
2.37.2

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.