From: Michael Trapp <michael.trapp@sap.com>
Date: Tue, 2 Aug 2022 12:16:43 +0000 (+0200)
Subject: libuuid: check clock value from LIBUUID_CLOCK_FILE
X-Git-Tag: v2.39-rc1~543
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d1424d85ac9e2a1369ee920038825c154ee5443;p=thirdparty%2Futil-linux.git

libuuid: check clock value from LIBUUID_CLOCK_FILE

The clock value from the LIBUUID_CLOCK_FILE must be checked in
case of an update of libuuid. If clock==CLOCK_SEQ_CONT it must
be set to a new value.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 807dcd1151..e1ba3c3d0e 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -274,6 +274,11 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
 			last.tv_usec = tv2;
 			adjustment = a;
 		}
+		// reset in case of reserved CLOCK_SEQ_CONT
+		if (clock_seq == CLOCK_SEQ_CONT) {
+			last.tv_sec = 0;
+			last.tv_usec = 0;
+		}
 	}
 
 	if ((last.tv_sec == 0) && (last.tv_usec == 0)) {