From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 23 Feb 2018 20:39:46 +0000 (-0500)
Subject: libuuid: fix UBSAN issue in get_random_fd()
X-Git-Tag: debian/1.44.4-1~12^2~8
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6074cf36b9fa8e6aeb4041aa5c1e27093a51b611;p=tools%2Fe2fsprogs.git

libuuid: fix UBSAN issue in get_random_fd()

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index 0028c7c..af55093 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -154,7 +154,7 @@ static int get_random_fd(void)
 				fcntl(fd, F_SETFD, i | FD_CLOEXEC);
 		}
 #endif
-		srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
+		srand(((unsigned)getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
 #ifdef DO_JRAND_MIX
 		jrand_seed[0] = getpid() ^ (tv.tv_sec & 0xFFFF);
 		jrand_seed[1] = getppid() ^ (tv.tv_usec & 0xFFFF);