diff --git a/Cargo.lock b/Cargo.lock index abceaef..6c1307c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,12 +23,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "bitflags" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - [[package]] name = "bitflags" version = "1.3.2" @@ -231,11 +225,11 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-personality" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1a976577555db53f0a98e9b236e1ebff1a0a1793227ed1b88d7b9a03dda93" +checksum = "01b75a6f16d41feaade8e14b844d8a1f92c4b238543c80e8403dd27d9f86993c" dependencies = [ - "bitflags 0.7.0", + "bitflags 2.5.0", "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 0d18b42..9a0351b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ clap = { version = "4", features = ["derive"] } comfy-table = "7" console = "0.15.8" libc = "0.2" -linux-personality = "1" +linux-personality = "2" nix = { version = "0.29", features = ["ptrace", "signal"] } regex = "1" serde = { version = "1", features = ["derive"] } diff --git a/src/lib.rs b/src/lib.rs index c50f6c7..c734121 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,7 +75,7 @@ use comfy_table::presets::UTF8_BORDERS_ONLY; use comfy_table::CellAlignment::Right; use comfy_table::{Cell, ContentArrangement, Row, Table}; use libc::user_regs_struct; -use linux_personality::{personality, ADDR_NO_RANDOMIZE}; +use linux_personality::{personality, Personality}; use nix::sys::ptrace::{self, Event}; use nix::sys::signal::Signal; use nix::sys::wait::{wait, WaitStatus}; @@ -470,7 +470,8 @@ impl Tracer { pub fn run_tracee(command: &[String], envs: &[String], username: &Option) -> Result<()> { ptrace::traceme()?; - personality(ADDR_NO_RANDOMIZE).map_err(|_| anyhow!("Unable to set ADDR_NO_RANDOMIZE"))?; + personality(Personality::ADDR_NO_RANDOMIZE) + .map_err(|_| anyhow!("Unable to set ADDR_NO_RANDOMIZE"))?; let mut binary = command .get(0) .ok_or_else(|| anyhow!("No command"))?