From: Michael Trapp <michael.trapp@sap.com>
Date: Tue, 2 Aug 2022 12:16:43 +0000 (+0200)
Subject: [PATCH 04/24] libuuid: check clock value from LIBUUID_CLOCK_FILE
X-Git-Tag: archive/raspbian/2.40.2-8+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=270dbc44ca99e765e7064e6c60dccb4ff4a56790;p=util-linux.git

[PATCH 04/24] 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>

Gbp-Pq: Topic upstream
Gbp-Pq: Name 0004-libuuid-check-clock-value-from-LIBUUID_CLOCK_FILE.patch
---

diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 807dcd1..e1ba3c3 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)) {