1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Subject: fix-ppc64el-stack-corruption
From: Thiago Andrade Marques <andrade@debian.org>
Date: Fri, 13 Nov 2025 23:25:25 -0300
Forwarded: not-needed
--- a/htpdate.c
+++ b/htpdate.c
@@ -478,6 +478,14 @@
} while (precision >= 1);
close(server_s);
+ /* Cache values from stack before SSL free functions,
+ * which may corrupt the stack on some architectures (e.g. ppc64el)
+ */
+ long long final_offset = offset;
+ long long final_first_offset = first_offset;
+ long final_when = when;
+ long final_nap = nap;
+
#ifdef ENABLE_HTTPS
if (scheme) SSL_shutdown(conn);
SSL_CTX_free(tls_ctx);
@@ -485,17 +493,17 @@
#endif
/* Rounding */
- if (debug) printlog(0, "when: %ld, nap: %ld", when, nap);
- if (offset == LLONG_MAX) return(ERR_TIMESTAMP);
- if (when + nap == 1000000000 && offset == 0) return 0;
+ if (debug) printlog(0, "when: %ld, nap: %ld", final_when, final_nap);
+ if (final_offset == LLONG_MAX) return(ERR_TIMESTAMP);
+ if (final_when + final_nap == 1000000000 && final_offset == 0) return 0;
/* Return the time delta between web server time (timevalue)
and system time (now)
*/
- if (first_offset < 0) {
- return((double)-first_offset + (1000000000-(double)when)/1000000000);
+ if (final_first_offset < 0) {
+ return((double)-final_first_offset + (1000000000-(double)final_when)/1000000000);
} else {
- return((double)-first_offset + 1 - ((double)when/1000000000));
+ return((double)-final_first_offset + 1 - ((double)final_when/1000000000));
}
}
|
