Skip to content

Building 70 Projects ranging from beginner to advanced so anyone can β€” learn from, build upon, use as a reference, or even copy directly. Owned by my cybersecurity company πŸ‘‡

fix(lisdex): NUL-terminate char buffers so the synthesizer stops forging bugs

CarterPerez-dev7635b8fdb945
diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/emit.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/emit.rs
index 6dd85003..d11b54ff 100644
--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/emit.rs
+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/emit.rs
@@ -5,7 +5,7 @@ use std::fmt::Write;
use crate::plan::{
CALLBACK_BUDGET, CURSOR_LOCAL, CURSOR_STRUCT, CallbackKind, CallbackStub, FUZZ_DATA, FUZZ_SIZE,
- HarnessPlan, Init, MAX_CALLBACK_CALLS, Stmt, Value,
+ HarnessPlan, Init, MAX_CALLBACK_CALLS, NUL_COPY_LOCAL, Stmt, Value,
};
pub const CALLBACK_COUNTER: &str = "lisdex_callback_calls";
@@ -151,12 +151,33 @@ fn render_entry(out: &mut String, plan: &HarnessPlan) {
for statement in &plan.body {
render_stmt(out, statement);
}
+ if plan.needs_nul_copy {
+ let _ = writeln!(out, " free({NUL_COPY_LOCAL});");
+ }
let _ = writeln!(out, " return 0;");
let _ = writeln!(out, "}}");
}
fn render_prologue(out: &mut String, plan: &HarnessPlan) {
let mut wrote = false;
+ // A char-family buffer handed the raw AFL testcase is not NUL-terminated, and the
+ // driver poisons the byte just past `size`. libarchive's date parser read off the
+ // end and ASAN blamed libarchive, not the harness.
+ if plan.needs_nul_copy {
+ let _ = writeln!(
+ out,
+ " char *{NUL_COPY_LOCAL} = (char *)malloc({FUZZ_SIZE} + 1);"
+ );
+ let _ = writeln!(out, " if ({NUL_COPY_LOCAL} == NULL) {{");
+ let _ = writeln!(out, " return 0;");
+ let _ = writeln!(out, " }}");
+ let _ = writeln!(
+ out,
+ " memcpy({NUL_COPY_LOCAL}, {FUZZ_DATA}, {FUZZ_SIZE});"
+ );
+ let _ = writeln!(out, " {NUL_COPY_LOCAL}[{FUZZ_SIZE}] = '\\0';");
+ wrote = true;
+ }
if plan.needs_cursor {
let _ = writeln!(out, " {CURSOR_LOCAL}.data = {FUZZ_DATA};");
let _ = writeln!(out, " {CURSOR_LOCAL}.size = {FUZZ_SIZE};");
@@ -240,6 +261,7 @@ fn render_value(value: &Value) -> String {
Value::Literal(text) | Value::Local(text) | Value::Callback(text) => text.clone(),
Value::AddressOf(name) => format!("&{name}"),
Value::Cursor => format!("&{CURSOR_LOCAL}"),
+ Value::NulTerminated => NUL_COPY_LOCAL.to_owned(),
}
}
diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/plan.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/plan.rs
index 22396653..476b0f9d 100644
--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/plan.rs
+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/plan.rs
@@ -7,6 +7,7 @@ pub const CURSOR_STRUCT: &str = "lisdex_cursor";
pub const CURSOR_LOCAL: &str = "lisdex_input";
pub const CALLBACK_BUDGET: &str = "LISDEX_CALLBACK_BUDGET";
pub const MAX_CALLBACK_CALLS: u32 = 4096;
+pub const NUL_COPY_LOCAL: &str = "lisdex_text";
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Value {
@@ -19,6 +20,7 @@ pub enum Value {
AddressOf(String),
Callback(String),
Cursor,
+ NulTerminated,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -81,6 +83,7 @@ pub struct HarnessPlan {
pub entry: String,
pub includes: Vec<String>,
pub needs_cursor: bool,
+ pub needs_nul_copy: bool,
pub callbacks: Vec<CallbackStub>,
pub body: Vec<Stmt>,
}
@@ -92,6 +95,7 @@ impl HarnessPlan {
entry: entry.into(),
includes: Vec::new(),
needs_cursor: false,
+ needs_nul_copy: false,
callbacks: Vec::new(),
body: Vec::new(),
}
@@ -114,10 +118,13 @@ impl HarnessPlan {
#[must_use]
pub fn with(mut self, statement: Stmt) -> Self {
- if let Stmt::Call { args, .. } = &statement
- && args.contains(&Value::Cursor)
- {
- self.needs_cursor = true;
+ if let Stmt::Call { args, .. } = &statement {
+ if args.contains(&Value::Cursor) {
+ self.needs_cursor = true;
+ }
+ if args.contains(&Value::NulTerminated) {
+ self.needs_nul_copy = true;
+ }
}
self.body.push(statement);
self
diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/synth.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/synth.rs
index 17def7a2..5b9699a6 100644
--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/synth.rs
+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex-harness/src/synth.rs
@@ -136,9 +136,15 @@ fn bind(
) -> Result<Value, Refusal> {
let label = param.name.clone().unwrap_or_else(|| param.spelling.clone());
match role {
- ParamRole::Buffer => Ok(Value::Data {
- cast: cast_for(param)?,
- }),
+ ParamRole::Buffer => match &param.shape {
+ Shape::Pointer {
+ pointee: Pointee::Char | Pointee::SignedChar,
+ ..
+ } => Ok(Value::NulTerminated),
+ _ => Ok(Value::Data {
+ cast: cast_for(param)?,
+ }),
+ },
ParamRole::Length => Ok(Value::Size),
ParamRole::Config => Ok(Value::Zero),
ParamRole::Callback => Err(Refusal::NeedsCallback { param: label }),
@@ -276,6 +282,7 @@ pub fn plan_candidate(
#[cfg(test)]
mod tests {
use super::*;
+ use crate::emit;
use lisdex_surface::extract::{Field, Record};
use lisdex_surface::rank::Complexity;
use lisdex_surface::signature::{Analysis, Returns};
@@ -575,6 +582,60 @@ mod tests {
);
}
+ #[test]
+ fn a_char_buffer_is_nul_terminated_not_handed_the_raw_testcase() {
+ let dated = candidate(
+ "archive_parse_date",
+ vec![
+ param("now", "time_t", Shape::Integral),
+ param(
+ "datestr",
+ "const char *",
+ Shape::Pointer {
+ pointee: Pointee::Char,
+ is_const: true,
+ },
+ ),
+ ],
+ vec![ParamRole::Length, ParamRole::Buffer],
+ Fuzzability::CastBuffer,
+ Returns::default(),
+ );
+ let plans = plan_candidate(&dated, "archive.h", &Vocabulary::default()).unwrap();
+ let Stmt::Call { args, .. } = call_in(&plans[0]) else {
+ unreachable!()
+ };
+ assert_eq!(
+ args[1],
+ Value::NulTerminated,
+ "handing the raw AFL testcase to a const char* made libarchive read past the poisoned tail and ASAN blamed libarchive"
+ );
+ assert!(plans[0].needs_nul_copy);
+ }
+
+ #[test]
+ fn a_byte_buffer_still_gets_the_raw_testcase_with_no_copy() {
+ let decode = candidate(
+ "decode",
+ vec![
+ param(
+ "data",
+ "const unsigned char *",
+ Shape::Pointer {
+ pointee: Pointee::UnsignedChar,
+ is_const: true,
+ },
+ ),
+ param("len", "size_t", Shape::Integral),
+ ],
+ vec![ParamRole::Buffer, ParamRole::Length],
+ Fuzzability::DirectBuffer,
+ Returns::default(),
+ );
+ let plans = plan_candidate(&decode, "x.h", &Vocabulary::default()).unwrap();
+ assert!(!plans[0].needs_nul_copy);
+ }
+
#[test]
fn a_cast_is_built_from_the_shape_never_from_an_array_spelling() {
let arr = candidate(
@@ -598,10 +659,41 @@ mod tests {
let Stmt::Call { args, .. } = call_in(&plans[0]) else {
unreachable!()
};
+ assert_eq!(
+ args[0],
+ Value::NulTerminated,
+ "a char array is a string parameter, so it gets the NUL-terminated copy and the `const char[]` spelling never reaches a cast"
+ );
+ assert!(!emit::render(&plans[0], "x.c").contains("[]"));
+ }
+
+ #[test]
+ fn a_void_buffer_cast_comes_from_the_shape() {
+ let decode = candidate(
+ "decode",
+ vec![
+ param(
+ "buf",
+ "some_voidp",
+ Shape::Pointer {
+ pointee: Pointee::Void,
+ is_const: true,
+ },
+ ),
+ param("size", "size_t", Shape::Integral),
+ ],
+ vec![ParamRole::Buffer, ParamRole::Length],
+ Fuzzability::CastBuffer,
+ Returns::default(),
+ );
+ let plans = plan_candidate(&decode, "x.h", &Vocabulary::default()).unwrap();
+ let Stmt::Call { args, .. } = call_in(&plans[0]) else {
+ unreachable!()
+ };
assert_eq!(
args[0],
Value::Data {
- cast: Some("const char *".to_owned())
+ cast: Some("const void *".to_owned())
}
);
}
diff --git a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex/src/main.rs b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex/src/main.rs
index ff03abdc..8e4608a9 100644
--- a/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex/src/main.rs
+++ b/PROJECTS/advanced/zero-day-vulnerability-scanner/crates/lisdex/src/main.rs
@@ -194,7 +194,8 @@ fn harness(args: &HarnessArgs) -> Result<(), Box<dyn Error>> {
let analysis = surface::analyze(&options)?;
let mut refusals = Vec::new();
- let root = analysis.header_root.clone();
+ let root = std::fs::canonicalize(&analysis.header_root)
+ .unwrap_or_else(|_| analysis.header_root.clone());
for candidate in analysis.ranking.candidates.iter().take(args.top) {
let vocabulary =
extract::parse_vocabulary(&candidate.header, &options.parse_options(&root))?;