Skip to content

Commit ca03130

Browse files
authored
Ignore a null AT_BASE value. (#934)
When processing AUX values, don't check whether `AT_BASE` is valid if it is NULL, as NULL indicates a static executable that doesn't have a dynamic linker. Fixes #933.
1 parent d482974 commit ca03130

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ jobs:
231231
RUSTFLAGS: --cfg rustix_use_experimental_features
232232
strategy:
233233
matrix:
234-
build: [ubuntu, ubuntu-20.04, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-11, windows, windows-2019]
234+
build: [ubuntu, ubuntu-20.04, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-11, windows, windows-2019, musl]
235235
include:
236236
- build: ubuntu
237237
os: ubuntu-latest
@@ -413,6 +413,10 @@ jobs:
413413
- build: windows-2019
414414
os: windows-2019
415415
rust: nightly
416+
- build: musl
417+
os: ubuntu-latest
418+
rust: stable
419+
target: x86_64-unknown-linux-musl
416420
steps:
417421
- uses: actions/checkout@v3
418422
with:

src/backend/linux_raw/param/auxv.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,11 @@ unsafe fn init_from_aux_iter(aux_iter: impl Iterator<Item = Elf_auxv_t>) -> Opti
307307
AT_SYSINFO_EHDR => sysinfo_ehdr = check_elf_base(a_val as *mut _)?.as_ptr(),
308308

309309
AT_BASE => {
310-
let _ = check_elf_base(a_val.cast())?;
310+
// The `AT_BASE` value can be NULL in a static executable that
311+
// doesn't use a dynamic linker. If so, ignore it.
312+
if !a_val.is_null() {
313+
let _ = check_elf_base(a_val.cast())?;
314+
}
311315
}
312316

313317
#[cfg(feature = "runtime")]

0 commit comments

Comments
 (0)