[libc-commits] [libc] [libc] fortify jmp buffer for x86-64 (PR #112769)

Nick Desaulniers via libc-commits libc-commits at lists.llvm.org
Mon Nov 18 13:34:58 PST 2024


================
@@ -0,0 +1,44 @@
+//===-- Implementation for jmpbuf checksum ----------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/setjmp/checksum.h"
+#include "src/__support/OSUtil/io.h"
+#include "src/stdlib/abort.h"
+#include <sys/syscall.h>
+
+namespace LIBC_NAMESPACE_DECL {
+namespace jmpbuf {
+// random bytes from https://www.random.org/cgi-bin/randbyte?nbytes=8&format=h
+// the cookie should not be zero otherwise it will be a bad seed as a multiplier
+__UINTPTR_TYPE__ value_mask =
+    static_cast<__UINTPTR_TYPE__>(0x3899'f0d3'5005'd953ull);
+__UINTPTR_TYPE__ checksum_cookie =
+    static_cast<__UINTPTR_TYPE__>(0xc7d9'd341'6afc'33f2ull);
+
+// initialize the checksum state
+void initialize() {
+  union {
+    struct {
+      __UINTPTR_TYPE__ entropy0;
+      __UINTPTR_TYPE__ entropy1;
+    };
+    char buffer[sizeof(__UINTPTR_TYPE__) * 2];
+  };
+  syscall_impl<long>(SYS_getrandom, buffer, sizeof(buffer), 0);
----------------
nickdesaulniers wrote:

Can this be simply:
```suggestion
  __UINTPTR_TYPE__ entropy [2];
  syscall_impl<long>(SYS_getrandom, &entropy, sizeof(entropy), 0);
```
(Then `entropy[0]` and entropy[1]` used below?)

https://github.com/llvm/llvm-project/pull/112769


More information about the libc-commits mailing list