Commit 1690b35770a97aec4b8a7b1b31a61b01e04f5656 | zig

author	LemonBoy <thatlemon@gmail.com> 2021-10-23 10:20:57+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-10-23 22:48:25-04:00
log	1690b35770a97aec4b8a7b1b31a61b01e04f5656
tree	33e221f8173d3732e0cb5899dc5e50fe176ace78
parent	22b4c9e1a9595bd94ada4c500a430e2668ffcd07

std: Fix edge case in TLS tp calculation

The TLS area may be located in the upper part of the address space and,
if the platform expects a constant offset to be applied, may make the tp
register calculation overflow.

Use +% instead of +, the overflow is harmless.

1 files changed, 4 insertions(+), 2 deletions(-)

lib
- std
  - os
    linux
    tls.zig

lib/std/os/linux/tls.zig+4-2

 @@ -289,8 +289,10 @@ pub fn prepareTLS(area: []u8) usize {
     // Copy the data
     mem.copy(u8, area[tls_image.data_offset..], tls_image.init_data);
-    // Return the corrected (if needed) value for the tp register
+    // Return the corrected value (if needed) for the tp register.
-    return @ptrToInt(area.ptr) + tls_tp_offset +
+    // Overflow here is not a problem, the pointer arithmetic involving the tp
+    // is done with wrapping semantics.
+    return @ptrToInt(area.ptr) +% tls_tp_offset +%
         if (tls_tp_points_past_tcb) tls_image.data_offset else tls_image.tcb_offset;
 }