From: Szabolcs Nagy <nsz@port70.net>
Date: Wed, 23 Sep 2015 20:22:33 +0000 (+0000)
Subject: avoid reading uninitialized memory in __map_file
X-Git-Tag: v1.1.12~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd275378d35b3535bc8b8321780b00e486c36d96;p=oweals%2Fmusl.git

avoid reading uninitialized memory in __map_file

The value of *size is not relevant in case of failure, but it's
better not to copy garbage from the stack into it.
(The compiler cannot see through the syscall, so optimization
was not affected by the unspecified value).
---

diff --git a/src/time/__map_file.c b/src/time/__map_file.c
index d06a5814..b91eb8ed 100644
--- a/src/time/__map_file.c
+++ b/src/time/__map_file.c
@@ -11,9 +11,10 @@ const char unsigned *__map_file(const char *pathname, size_t *size)
 	const unsigned char *map = MAP_FAILED;
 	int fd = __sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
 	if (fd < 0) return 0;
-	if (!__syscall(SYS_fstat, fd, &st))
+	if (!__syscall(SYS_fstat, fd, &st)) {
 		map = __mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+		*size = st.st_size;
+	}
 	__syscall(SYS_close, fd);
-	*size = st.st_size;
 	return map == MAP_FAILED ? 0 : map;
 }