Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fix Uint<256> conversion issues by clamping values #556

Merged
merged 3 commits into from
Jan 30, 2025
Merged

feat: fix Uint<256> conversion issues by clamping values #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d87f63
feat: fix `Uint<256>` conversion issues by clamping values
Jon-Becker Jan 30, 2025
05653c7
fix: clamp options
Jon-Becker Jan 30, 2025
220d20f
test: Add u256 overflow decompile tests
Jon-Becker Jan 30, 2025
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
50 changes: 50 additions & 0 deletions crates/core/tests/test_decompile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,56 @@ mod integration_tests {
}
}

#[tokio::test]
async fn test_decompile_u256_conversion_overflow_1() {
let rpc_url = std::env::var("RPC_URL").unwrap_or_else(|_| {
println!("RPC_URL not set, skipping test");
std::process::exit(0);
});

let result = decompile(DecompilerArgs {
target: String::from("0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7"),
rpc_url,
default: true,
skip_resolving: true,
include_solidity: true,
include_yul: false,
output: String::from(""),
name: String::from(""),
timeout: 10000,
abi: None,
openai_api_key: String::from(""),
llm_postprocess: false,
})
.await
.expect("failed to decompile");
}

#[tokio::test]
async fn test_decompile_u256_conversion_overflow_2() {
let rpc_url = std::env::var("RPC_URL").unwrap_or_else(|_| {
println!("RPC_URL not set, skipping test");
std::process::exit(0);
});

let result = decompile(DecompilerArgs {
target: String::from("0x5141b82f5ffda4c6fe1e372978f1c5427640a190"),
rpc_url,
default: true,
skip_resolving: true,
include_solidity: true,
include_yul: false,
output: String::from(""),
name: String::from(""),
timeout: 10000,
abi: None,
openai_api_key: String::from(""),
llm_postprocess: false,
})
.await
.expect("failed to decompile");
}

#[tokio::test]
async fn test_decompile_weth() {
let rpc_url = std::env::var("RPC_URL").unwrap_or_else(|_| {
Expand Down
37 changes: 19 additions & 18 deletions crates/vm/src/core/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ impl VM {
let b = self.stack.pop()?;

// convert a to usize
let usize_a: usize = a.value.try_into()?;
let usize_a: usize = a.value.try_into().unwrap_or(usize::MAX);

let mut result = I256::ZERO;
if !b.value.is_zero() {
Expand All @@ -737,8 +737,8 @@ impl VM {
let size = self.stack.pop()?.value;

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let size: usize = size.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);
let size: usize = size.try_into().unwrap_or(usize::MAX);

let data = self.memory.read(offset, size);
let result = keccak256(data);
Expand Down Expand Up @@ -802,9 +802,9 @@ impl VM {
let i = self.stack.pop()?.value;

// Safely convert U256 to usize
let i: usize = i.try_into()?;
let i: usize = i.try_into().unwrap_or(usize::MAX);

let result = if i + 32 > self.calldata.len() {
let result = if i.saturating_add(32) > self.calldata.len() {
let mut value = [0u8; 32];

if i <= self.calldata.len() {
Expand Down Expand Up @@ -881,6 +881,7 @@ impl VM {
let offset: usize = offset.try_into().unwrap_or(usize::MAX);
let size: usize = size.try_into().unwrap_or(usize::MAX);

// clamp values to bytecode length
let value_offset_safe = offset.saturating_add(size).min(self.bytecode.len());
let mut value =
self.bytecode.get(offset..value_offset_safe).unwrap_or(&[]).to_owned();
Expand Down Expand Up @@ -932,8 +933,8 @@ impl VM {
let size = self.stack.pop()?.value;

// Safely convert U256 to usize
let dest_offset: usize = dest_offset.try_into()?;
let size: usize = size.try_into()?;
let dest_offset: usize = dest_offset.try_into().unwrap_or(0);
let size: usize = size.try_into().unwrap_or(256);

let mut value = Vec::with_capacity(size);
value.fill(0xff);
Expand Down Expand Up @@ -971,8 +972,8 @@ impl VM {
let size = self.stack.pop()?.value;

// Safely convert U256 to usize
let dest_offset: usize = dest_offset.try_into()?;
let size: usize = size.try_into()?;
let dest_offset: usize = dest_offset.try_into().unwrap_or(0);
let size: usize = size.try_into().unwrap_or(256);

let mut value = Vec::with_capacity(size);
value.fill(0xff);
Expand Down Expand Up @@ -1033,7 +1034,7 @@ impl VM {
// MLOAD
0x51 => {
let i = self.stack.pop()?.value;
let i: usize = i.try_into()?;
let i: usize = i.try_into().unwrap_or(usize::MAX);

let result = U256::from_be_slice(self.memory.read(i, 32).as_slice());

Expand All @@ -1050,7 +1051,7 @@ impl VM {
let value = self.stack.pop()?.value;

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);

// consume dynamic gas
let gas_cost = self.memory.expansion_cost(offset, 32);
Expand All @@ -1071,7 +1072,7 @@ impl VM {
let value = self.stack.pop()?.value;

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);

// consume dynamic gas
let gas_cost = self.memory.expansion_cost(offset, 1);
Expand Down Expand Up @@ -1289,8 +1290,8 @@ impl VM {
self.stack.pop_n(topic_count as usize).iter().map(|x| x.value).collect();

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let size: usize = size.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);
let size: usize = size.try_into().unwrap_or(usize::MAX);

let data = self.memory.read(offset, size);

Expand Down Expand Up @@ -1341,8 +1342,8 @@ impl VM {
let size = self.stack.pop()?.value;

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let size: usize = size.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);
let size: usize = size.try_into().unwrap_or(usize::MAX);

// consume dynamic gas
let gas_cost = self.memory.expansion_cost(offset, size);
Expand Down Expand Up @@ -1380,8 +1381,8 @@ impl VM {
let size = self.stack.pop()?.value;

// Safely convert U256 to usize
let offset: usize = offset.try_into()?;
let size: usize = size.try_into()?;
let offset: usize = offset.try_into().unwrap_or(usize::MAX);
let size: usize = size.try_into().unwrap_or(usize::MAX);

self.exit(1, self.memory.read(offset, size));
}
Expand Down
Loading