Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/asan-prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ runs:
wget
- uses: dtolnay/rust-toolchain@stable
- name: install just
uses: extractions/setup-just@v2
with:
just-version: '1.40.0'
uses: extractions/setup-just@v3
- name: Install cargo-binstall
shell: bash
run: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/fuzzer-tester-prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ runs:
shell: bash
run: sudo apt update && sudo apt install -y libgtk-3-dev pax-utils python3-msgpack python3-jinja2 libcapstone-dev
- name: install just
uses: extractions/setup-just@v2
with:
just-version: '1.40.0'
uses: extractions/setup-just@v3
- name: Add wasm target
if: ${{ inputs.fuzzer-name == 'fuzz_anything/baby_fuzzer_wasm' }}
shell: bash
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/qemu-fuzzer-tester-prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ runs:
shell: bash
run: export MAKEFLAGS="-j$(expr $(nproc) \+ 1)"
- name: install just
uses: extractions/setup-just@v2
with:
just-version: '1.40.0'
uses: extractions/setup-just@v3
- uses: actions/checkout@v4
with:
submodules: true
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ubuntu-prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ runs:
# -----------------------------------------

- name: Install just
uses: extractions/setup-just@v2
with:
just-version: '1.40.0'
uses: extractions/setup-just@v3

- uses: taiki-e/install-action@cargo-hack

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/windows-tester-prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ runs:
shell: pwsh
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
- name: install just
uses: extractions/setup-just@v2
with:
just-version: '1.40.0'
uses: extractions/setup-just@v3
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.2
FROM rust:1.87.0 AS libafl
FROM rust:1.91.0 AS libafl
LABEL "maintainer"="afl++ team <[email protected]>"
LABEL "about"="LibAFL Docker image"

Expand Down Expand Up @@ -63,7 +63,6 @@ RUN apt-get update && \
python3 \
python3-pip \
python3-venv \
software-properties-common \
ca-certificates \
wget
RUN set -ex &&\
Expand Down
4 changes: 2 additions & 2 deletions crates/libafl/src/executors/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ impl CommandConfigurator<Child> for StdCommandConfigurator {

/// Linux specific [`CommandConfigurator`] that leverages `ptrace`
///
/// This configurator was primarly developed to be used in conjunction with
/// This configurator was primarily developed to be used in conjunction with
/// [`crate::executors::hooks::intel_pt::IntelPTHook`]
#[cfg(all(feature = "intel_pt", target_os = "linux"))]
#[derive(Debug, Clone, PartialEq, Eq, TypedBuilder)]
Expand Down Expand Up @@ -305,7 +305,7 @@ impl CommandConfigurator<Pid> for PTraceCommandConfigurator {
Duration::from_secs(u64::from(self.timeout))
}

/// Use [`PTraceCommandConfigurator::builder().timeout`] instead
/// Use [`PTraceCommandConfigurator::builder()`](PTraceCommandConfigurator) instead
fn exec_timeout_mut(&mut self) -> &mut Duration {
unimplemented!("Use [`PTraceCommandConfigurator::builder().timeout`] instead")
}
Expand Down
8 changes: 4 additions & 4 deletions crates/libafl_bolts/src/anymap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use core::{any::TypeId, mem::size_of, ptr::read_unaligned};

/// Get a `type_id` from its previously unpacked `u128`.
/// Opposite of [`unpack_type_id(id)`].
/// Get a [`TypeId`] from its previously unpacked `u128`.
/// Opposite of [`unpack_type_id`].
///
/// # Note
/// Probably not safe for future compilers, fine for now.
Expand All @@ -16,8 +16,8 @@ pub const fn pack_type_id(id: u128) -> TypeId {
unsafe { *(&raw const id as *const TypeId) }
}

/// Unpack a `type_id` to an `u128`
/// Opposite of [`pack_type_id(id)`].
/// Unpack a [`TypeId`] to an `u128`
/// Opposite of [`pack_type_id`].
///
/// # Note
/// Probably not safe for future compilers, fine for now.
Expand Down
6 changes: 3 additions & 3 deletions crates/libafl_bolts/src/llmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ where
}

/// Create this client on an existing map from the given description.
/// Acquired with [`self.describe`].
/// Acquired with [`LlmpSender::describe`].
pub fn on_existing_from_description(
mut shmem_provider: SP,
description: &LlmpDescription,
Expand Down Expand Up @@ -3005,7 +3005,7 @@ where
}

/// Registers a new client for the given sharedmap str and size.
/// Returns the id of the new client in [`broker.client_shmem`]
/// Returns the [`ClientId`] of the newly registered client.
pub fn register_client(&mut self, mut client_page: LlmpSharedMap<SHM>) -> ClientId {
// Tell the client it may unmap its initial allocated shmem page now.
// Since we now have a handle to it, it won't be umapped too early (only after we also unmap it)
Expand Down Expand Up @@ -3614,7 +3614,7 @@ where
})
}

/// Recreate this client from a previous [`client.to_env()`]
/// Recreate this client from a previous [`LlmpClient::to_env`]
#[cfg(feature = "std")]
pub fn on_existing_from_env(shmem_provider: SP, env_name: &str) -> Result<Self, Error> {
Ok(Self {
Expand Down
2 changes: 1 addition & 1 deletion crates/libafl_bolts/src/target_args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub enum InputLocation {
input_file: Option<InputFile>,
},
/// Deliver the input via the specified [`InputFile`]
/// You can use specify [`InputFile::create(INPUTFILE_STD)`] to use a default filename.
/// You can use [`InputFile::create`] with [`crate::fs::INPUTFILE_STD`] to use a default filename.
File {
/// The file to write input to. The target should read input from this location.
out_file: InputFile,
Expand Down
4 changes: 2 additions & 2 deletions crates/libafl_cc/src/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ where
pub calling_func: String,
/// Indexes of successor block.
pub successor_basic_blocks: Vec<usize>,
/// ``prev_loc`` >> 1 ^ ``cur_loc`` of edges connecting [`CfgEdge.bottom_node_loc`]
/// ``prev_loc`` >> 1 ^ ``cur_loc`` of edges connecting [`CfgEdge::bottom_node_loc`]
/// to successor blocks.
pub successor_edges: Vec<usize>,
/// Custom metadata.
Expand Down Expand Up @@ -62,7 +62,7 @@ pub struct EntryBasicBlockInfo {
pub calling_func: String,
/// The node's index (i.e., ``cur_loc``).
pub node_loc: usize,
/// ``prev_loc`` >> 1 ^ ``cur_loc`` of edges connecting [`EntryBasicBlockInfo.node_loc`]
/// ``prev_loc`` >> 1 ^ ``cur_loc`` of edges connecting [`EntryBasicBlockInfo::node_loc`]
/// to successor blocks.
pub successor_edges: Vec<usize>,
}
Expand Down
6 changes: 1 addition & 5 deletions crates/libafl_frida/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,7 @@ fn main() {
output_str.as_str()
);
} else {
let compiler = cc::Build::new()
.cpp(true)
.opt_level(0)
.shared_flag(true)
.get_compiler();
let compiler = cc::Build::new().cpp(true).opt_level(0).get_compiler();
let clangpp = compiler.path();
let mut cmd = std::process::Command::new(clangpp);
cmd.args(compiler.args())
Expand Down
2 changes: 1 addition & 1 deletion crates/libafl_frida/src/asan/asan_rt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2574,7 +2574,7 @@ impl AsanRuntime {
#[cfg(target_arch = "aarch64")]
#[must_use]
#[inline]
#[expect(clippy::similar_names, clippy::type_complexity)]
#[expect(clippy::type_complexity)]
pub fn asan_is_interesting_instruction(
decoder: InstDecoder,
_address: u64,
Expand Down
Loading