mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-12 14:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove old zip base skew hack

Browse source 
Since 8ff48201ca we no longer need the
hack where, when running .com.dbg files, we scanned for the embedded
.com file offset, and then computed zip offsets realtive to that. It
wasn't very reliable in the first place, and was causing issues with
running our new .com.dbg executables, which are true zip files.
This commit is contained in:
Justine Tunney 2023-06-17 04:20:16 -07:00
parent 207e18a060
commit 52d28966f7
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
10 changed files with 134 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libc/intrin/ftrapv.c
View file

@ -39,8 +39,8 @@ int __negvsi2(int x) {
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
long __negvdi2(long x) {
if (x == LONG_MIN) {
long long __negvdi2(long long x) {
if (x == LLONG_MIN) {
__on_arithmetic_overflow();
}
return -x;
@ -79,8 +79,8 @@ int __addvsi3(int x, int y) {
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
long __addvdi3(long x, long y) {
long z;
long long __addvdi3(long long x, long long y) {
long long z;
if (ckd_add(&z, x, y)) {
__on_arithmetic_overflow();
}
@ -121,8 +121,8 @@ int __subvsi3(int x, int y) {
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
long __subvdi3(long x, long y) {
long z;
long long __subvdi3(long long x, long long y) {
long long z;
if (ckd_sub(&z, x, y)) {
__on_arithmetic_overflow();
}
@ -163,22 +163,8 @@ int __mulvsi3(int x, int y) {
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
long __mulvdi3(long x, long y) {
long z;
if (ckd_mul(&z, x, y)) {
__on_arithmetic_overflow();
}
return z;
}
/**
* Returns 𝑥*𝑦, aborting on overflow.
*
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
int128_t __mulvti3(int128_t x, int128_t y) {
int128_t z;
long long __mulvdi3(long long x, long long y) {
long long z;
if (ckd_mul(&z, x, y)) {
__on_arithmetic_overflow();
}

39
libc/str/findembeddedape.c → libc/intrin/mulvti3.c
View file

@ -1,7 +1,7 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2021 Justine Alexandra Roberts Tunney │
│ Copyright 2023 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
@ -16,35 +16,20 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/intrin/bits.h"
#include "libc/log/libfatal.internal.h"
#include "libc/macros.internal.h"
#include "libc/str/str.h"
#include "libc/runtime/internal.h"
#define TRIES 8
int128_t __muloti4(int128_t, int128_t, int *);
/**
* Returns offset of binary embedded inside binary.
* Returns 𝑥*𝑦, aborting on overflow.
*
* This can be used to load zip assets from an executable that hasn't
* gone through the `objcopy -S -O binary` step. We make the assumption
* that an x86_64-pc-linux-gnu toolchain is being used. This routine
* would need to be changed to accommodate binaries built locally on
* Apple, FreeBSD, etc.
*
* @param p needs to be page aligned
* @param n is byte length of p
* @return base address of image or NULL if not found
* @see __on_arithmetic_overflow()
* @see -ftrapv to enable
*/
uint8_t *FindEmbeddedApe(const uint8_t *p, size_t n) {
size_t i;
uint64_t w;
n = MIN(n, TRIES * PAGESIZE);
for (i = 0; i + 8 <= n; i += PAGESIZE) {
w = READ64LE(p + i);
if (w == READ64LE("MZqFpD='") || w == READ64LE("\177ELF\2\1\1\11")) {
return (/*unconst*/ uint8_t *)(p + i);
}
}
return 0;
int128_t __mulvti3(int128_t x, int128_t y) {
int o;
int128_t z;
z = __muloti4(x, y, &o);
if (o) __on_arithmetic_overflow();
return z;
}

11
libc/str/iszipeocd32.c
View file

@ -16,12 +16,14 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/stdckdint.h"
#include "libc/zip.internal.h"
/**
* Determines if ZIP EOCD record seems legit.
*/
int IsZipEocd32(const uint8_t *p, size_t n, size_t i) {
size_t offset;
if (i > n || n - i < kZipCdirHdrMinSize) {
return kZipErrorEocdOffsetOverflow;
}
@ -35,12 +37,15 @@ int IsZipEocd32(const uint8_t *p, size_t n, size_t i) {
return kZipErrorEocdDiskMismatch;
}
if (ZIP_CDIR_RECORDSONDISK(p + i) != ZIP_CDIR_RECORDS(p + i)) {
return kZipErrorCdirRecordsMismatch;
return kZipErrorEocdRecordsMismatch;
}
if (ZIP_CDIR_RECORDS(p + i) * kZipCfileHdrMinSize > ZIP_CDIR_SIZE(p + i)) {
return kZipErrorCdirRecordsOverflow;
return kZipErrorEocdRecordsOverflow;
}
if (ZIP_CDIR_OFFSET(p + i) + ZIP_CDIR_SIZE(p + i) > i) {
if (ckd_add(&offset, ZIP_CDIR_OFFSET(p + i), ZIP_CDIR_SIZE(p + i))) {
return kZipErrorEocdOffsetSizeOverflow;
}
if (offset > i) {
return kZipErrorCdirOffsetPastEocd;
}
return kZipOk;

29
libc/str/iszipeocd64.c
View file

@ -16,34 +16,41 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/stdckdint.h"
#include "libc/zip.internal.h"
/**
* Returns kZipOk if zip64 end of central directory header seems legit.
*/
int IsZipEocd64(const uint8_t *p, size_t n, size_t i) {
if (i + kZipCdir64HdrMinSize > n) {
size_t off, loc;
uint64_t cdsize;
if (i > n || i + kZipCdir64HdrMinSize > n) {
return kZipErrorEocdOffsetOverflow;
}
if (READ32LE(p + i) != kZipCdir64HdrMagic) {
return kZipErrorEocdMagicNotFound;
}
if (i + ZIP_CDIR64_HDRSIZE(p + i) + kZipCdir64LocatorSize > n) {
if (ckd_add(&loc, i, ZIP_CDIR64_HDRSIZE(p + i)) || //
ckd_add(&off, loc, kZipCdir64LocatorSize) || //
off > n) { //
return kZipErrorEocdSizeOverflow;
}
if (ZIP_LOCATE64_MAGIC(p + i + ZIP_CDIR64_HDRSIZE(p + i)) !=
kZipCdir64LocatorMagic) {
return kZipErrorCdirLocatorMagic;
if (ZIP_LOCATE64_MAGIC(p + loc) != kZipCdir64LocatorMagic) {
return kZipErrorEocdLocatorMagic;
}
if (ZIP_LOCATE64_OFFSET(p + i + ZIP_CDIR64_HDRSIZE(p + i)) != i) {
return kZipErrorCdirLocatorOffset;
if (ZIP_LOCATE64_OFFSET(p + loc) != i) {
return kZipErrorEocdLocatorOffset;
}
if (ZIP_CDIR64_RECORDS(p + i) * kZipCfileHdrMinSize >
ZIP_CDIR64_SIZE(p + i)) {
return kZipErrorCdirRecordsOverflow;
if (ckd_add(&off, ZIP_CDIR64_OFFSET(p + i), ZIP_CDIR64_SIZE(p + i))) {
return kZipErrorEocdOffsetSizeOverflow;
}
if (ZIP_CDIR64_OFFSET(p + i) + ZIP_CDIR64_SIZE(p + i) > i) {
if (off > i) {
return kZipErrorCdirOffsetPastEocd;
}
if (ckd_mul(&cdsize, ZIP_CDIR64_RECORDS(p + i), kZipCfileHdrMinSize) ||
cdsize > ZIP_CDIR64_SIZE(p + i)) {
return kZipErrorEocdRecordsOverflow;
}
return kZipOk;
}

38
libc/zip.internal.h
View file

@ -15,20 +15,27 @@
#define ZM_(x) ~VEIL("r", ~x) /* prevent magic from appearing in binary */
#endif
#define kZipOk 0
#define kZipErrorEocdNotFound -1
#define kZipErrorEocdOffsetOverflow -2
#define kZipErrorEocdMagicNotFound -3
#define kZipErrorEocdSizeOverflow -4
#define kZipErrorEocdDiskMismatch -5
#define kZipErrorCdirRecordsMismatch -6
#define kZipErrorCdirRecordsOverflow -7
#define kZipErrorCdirOffsetPastEocd -8
#define kZipErrorCdirLocatorMagic -9
#define kZipErrorCdirLocatorOffset -10
#define kZipErrorRaceCondition -11
#define kZipErrorMapFailed -12
#define kZipErrorOpenFailed -13
#ifdef TINY
#define _ZE(x) -1
#else
#define _ZE(x) x
#endif
#define kZipOk 0
#define kZipErrorEocdNotFound _ZE(-1)
#define kZipErrorEocdOffsetOverflow _ZE(-2)
#define kZipErrorEocdMagicNotFound _ZE(-3)
#define kZipErrorEocdSizeOverflow _ZE(-4)
#define kZipErrorEocdDiskMismatch _ZE(-5)
#define kZipErrorEocdOffsetSizeOverflow _ZE(-6)
#define kZipErrorEocdRecordsMismatch _ZE(-7)
#define kZipErrorEocdRecordsOverflow _ZE(-8)
#define kZipErrorCdirOffsetPastEocd _ZE(-9)
#define kZipErrorEocdLocatorMagic _ZE(-10)
#define kZipErrorEocdLocatorOffset _ZE(-11)
#define kZipErrorRaceCondition _ZE(-12)
#define kZipErrorMapFailed _ZE(-13)
#define kZipErrorOpenFailed _ZE(-14)
#define kZipCosmopolitanVersion kZipEra2001
@ -75,7 +82,7 @@
#define kZipCdirOffsetOffset 16
#define kZipCdirCommentSizeOffset 20
#define kZipCdir64HdrMagic ZM_(0x06064b50) /* PK♣♠ "PK\6\6" */
#define kZipCdir64HdrMagic ZM_(0x06064b50) /* PK♠♠ "PK\6\6" */
#define kZipCdir64HdrMinSize 56
#define kZipCdir64LocatorMagic ZM_(0x07064b50) /* PK♠• "PK\6\7" */
#define kZipCdir64LocatorSize 20
@ -211,7 +218,6 @@
#define ZIP_EXTRA_SIZE(P) (ZIP_EXTRA_CONTENTSIZE(P) + kZipExtraHdrSize)
void *GetZipEocd(const void *, size_t, int *);
uint8_t *FindEmbeddedApe(const uint8_t *, size_t);
int IsZipEocd32(const uint8_t *, size_t, size_t);
int IsZipEocd64(const uint8_t *, size_t, size_t);
int GetZipCfileMode(const uint8_t *);

16
libc/zipos/get.c
View file

@ -67,9 +67,9 @@ struct Zipos *__zipos_get(void) {
int fd, err, msg;
static bool once;
struct Zipos *res;
uint8_t *map, *cdir;
const char *progpath;
static struct Zipos zipos;
uint8_t *map, *base, *cdir;
__zipos_lock();
if (!once) {
progpath = getenv("COSMOPOLITAN_INIT_ZIPOS");
@ -86,15 +86,11 @@ struct Zipos *__zipos_get(void) {
}
if (fd != -1) {
if ((size = lseek(fd, 0, SEEK_END)) != -1 &&
(map = mmap(0, size, PROT_READ, MAP_SHARED, fd, 0)) != MAP_FAILED) {
if ((base = FindEmbeddedApe(map, size))) {
size -= base - map;
} else {
base = map;
}
if ((cdir = GetZipEocd(base, size, &err)) &&
_cmpxchg(&zipos.map, 0, base)) {
__zipos_munmap_unneeded(base, cdir, map);
(map = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0)) !=
MAP_FAILED) {
if ((cdir = GetZipEocd(map, size, &err))) {
__zipos_munmap_unneeded(map, cdir, map);
zipos.map = map;
zipos.cdir = cdir;
msg = kZipOk;
} else {