mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-01-31 03:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert recent fixupobj.com change

Browse source
This commit is contained in:
Justine Tunney 2022-08-21 17:33:54 -07:00
parent d52170ca34
commit 57b39d8793
3 changed files with 2 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
build/bootstrap/fixupobj.com
View file

Binary file not shown.

4
libc/calls/wincrash.c
View file

@ -29,11 +29,11 @@
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
unsigned __wincrash(struct NtExceptionPointers *ep) {
privileged unsigned __wincrash(struct NtExceptionPointers *ep) {
int64_t rip;
int sig, code;
ucontext_t ctx;
STRACE("__wincrash rip=%lx", ep->ContextRecord->Rip);
STRACE("__wincrash");
switch (ep->ExceptionRecord->ExceptionCode) {
case kNtSignalBreakpoint:

38
tool/build/fixupobj.c
View file

@ -26,7 +26,6 @@
#include "libc/elf/struct/sym.h"
#include "libc/errno.h"
#include "libc/fmt/itoa.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/safemacros.internal.h"
#include "libc/log/check.h"
#include "libc/log/log.h"
@ -37,7 +36,6 @@
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/prot.h"
#include "third_party/getopt/getopt.h"
#include "third_party/xed/x86.h"
/**
* @fileoverview GCC Codegen Fixer-Upper.
@ -153,41 +151,6 @@ void OptimizeRelocations(Elf64_Ehdr *elf, size_t elfsize) {
}
}
void CheckForTlsInPrivileged(const char *path, Elf64_Ehdr *elf,
size_t elfsize) {
int err;
size_t m;
Elf64_Half i;
struct Op *op;
Elf64_Shdr *shdr;
unsigned char *p, *e;
Elf64_Xword symcount;
struct XedDecodedInst xedd;
for (i = 0; i < elf->e_shnum; ++i) {
shdr = GetElfSectionHeaderAddress(elf, elfsize, i);
if (shdr->sh_type == SHT_PROGBITS &&
startswith(GetElfSectionName(elf, elfsize, shdr), ".privileged")) {
p = (unsigned char *)((uintptr_t)elf + shdr->sh_offset);
e = p + shdr->sh_size;
for (; p < e; p += m) {
xed_decoded_inst_zero_set_mode(&xedd, XED_MACHINE_MODE_LONG_64);
err = xed_instruction_length_decode(&xedd, p, e - p);
if (err == XED_ERROR_NONE) {
m = xedd.length;
if (xedd.op.seg_ovd == XED_SEG_FS) {
kprintf("%s: thread local storage not allowed in privileged "
"functions\n",
path);
exit(1);
}
} else {
m = 1;
}
}
}
}
}
void RewriteObject(const char *path) {
int fd;
struct stat st;
@ -203,7 +166,6 @@ void RewriteObject(const char *path) {
0)) == MAP_FAILED) {
SysExit(__COUNTER__ + 1, "mmap", path);
}
CheckForTlsInPrivileged(path, elf, st.st_size);
OptimizeRelocations(elf, st.st_size);
if (msync(elf, st.st_size, MS_ASYNC | MS_INVALIDATE)) {
SysExit(__COUNTER__ + 1, "msync", path);