Skip to content

Commit 5e9dbe8

Browse files
smtmfftBrechtpd
andauthored
fix(raiko): unsafe align vec to avoid unalign mem access (#291)
* fix(raiko): unsafe align vec to avoid unalign mem access Signed-off-by: qcloud <[email protected]> * Update lib/src/protocol_instance.rs Co-authored-by: Brecht Devos <[email protected]> * refine rpc error Signed-off-by: smtmfft <[email protected]> * fix ci Signed-off-by: smtmfft <[email protected]> --------- Signed-off-by: qcloud <[email protected]> Signed-off-by: smtmfft <[email protected]> Co-authored-by: Brecht Devos <[email protected]>
1 parent 927e697 commit 5e9dbe8

File tree

2 files changed

+31
-16
lines changed

2 files changed

+31
-16
lines changed

core/src/provider/rpc.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ impl BlockDataProvider for RpcBlockDataProvider {
7171
// Collect the data from the batch
7272
for request in requests {
7373
blocks.push(
74-
request
75-
.await
76-
.map_err(|_| RaikoError::RPC("Error collecting request data".to_owned()))?,
74+
request.await.map_err(|e| {
75+
RaikoError::RPC(format!("Error collecting request data: {e}"))
76+
})?,
7777
);
7878
}
7979

@@ -142,14 +142,14 @@ impl BlockDataProvider for RpcBlockDataProvider {
142142
.zip(code_requests.into_iter())
143143
{
144144
let (nonce, balance, code) = (
145-
nonce_request.await.map_err(|_| {
146-
RaikoError::RPC("Failed to collect nonce request".to_owned())
145+
nonce_request.await.map_err(|e| {
146+
RaikoError::RPC(format!("Failed to collect nonce request: {e}"))
147147
})?,
148-
balance_request.await.map_err(|_| {
149-
RaikoError::RPC("Failed to collect balance request".to_owned())
148+
balance_request.await.map_err(|e| {
149+
RaikoError::RPC(format!("Failed to collect balance request: {e}"))
150150
})?,
151-
code_request.await.map_err(|_| {
152-
RaikoError::RPC("Failed to collect code request".to_owned())
151+
code_request.await.map_err(|e| {
152+
RaikoError::RPC(format!("Failed to collect code request: {e}"))
153153
})?,
154154
);
155155

@@ -203,9 +203,9 @@ impl BlockDataProvider for RpcBlockDataProvider {
203203
// Collect the data from the batch
204204
for request in requests {
205205
values.push(
206-
request
207-
.await
208-
.map_err(|_| RaikoError::RPC("Error collecting request data".to_owned()))?,
206+
request.await.map_err(|e| {
207+
RaikoError::RPC(format!("Error collecting request data: {e}"))
208+
})?,
209209
);
210210
}
211211

@@ -305,7 +305,7 @@ impl BlockDataProvider for RpcBlockDataProvider {
305305
for request in requests {
306306
let mut proof = request
307307
.await
308-
.map_err(|_| RaikoError::RPC("Error collecting request data".to_owned()))?;
308+
.map_err(|e| RaikoError::RPC(format!("Error collecting request data: {e}")))?;
309309
idx += proof.storage_proof.len();
310310
if let Some(map_proof) = storage_proofs.get_mut(&proof.address) {
311311
map_proof.storage_proof.append(&mut proof.storage_proof);

lib/src/protocol_instance.rs

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
use super::utils::ANCHOR_GAS_LIMIT;
12
use alloy_consensus::Header as AlloyConsensusHeader;
23
use alloy_primitives::{Address, TxHash, B256};
34
use alloy_sol_types::SolValue;
45
use anyhow::{ensure, Result};
56
use c_kzg::{Blob, KzgCommitment, KzgSettings};
67
use sha2::{Digest as _, Sha256};
8+
use std::alloc::{alloc, Layout};
79

8-
use super::utils::ANCHOR_GAS_LIMIT;
910
#[cfg(not(feature = "std"))]
1011
use crate::no_std::*;
1112
use crate::{
@@ -40,8 +41,21 @@ impl ProtocolInstance {
4041
input.taiko.tx_blob_hash.unwrap()
4142
} else {
4243
println!("kzg check enabled!");
43-
let mut data = Vec::from(KZG_TRUST_SETUP_DATA);
44-
let kzg_settings = KzgSettings::from_u8_slice(&mut data);
44+
let data_size = KZG_TRUST_SETUP_DATA.len();
45+
let aligned_data_size = (data_size + 3) / 4 * 4;
46+
let layout = Layout::from_size_align(aligned_data_size, 4).unwrap();
47+
// Allocate aligned memory
48+
let raw_ptr = unsafe { alloc(layout) as *mut u8 };
49+
if raw_ptr.is_null() {
50+
panic!("Failed to allocate memory with aligned pointer");
51+
}
52+
// Convert to a Vec (unsafe because we are managing raw memory)
53+
let mut aligned_vec =
54+
unsafe { Vec::from_raw_parts(raw_ptr, data_size, aligned_data_size) };
55+
// Copy data into aligned_vec
56+
aligned_vec.copy_from_slice(KZG_TRUST_SETUP_DATA);
57+
58+
let kzg_settings = KzgSettings::from_u8_slice(&mut aligned_vec);
4559
let kzg_commit = KzgCommitment::blob_to_kzg_commitment(
4660
&Blob::from_bytes(input.taiko.tx_data.as_slice())
4761
.expect("Fail to form blob from tx bytes"),
@@ -54,6 +68,7 @@ impl ProtocolInstance {
5468
input.taiko.tx_blob_hash.unwrap(),
5569
"Blob version hash not matching"
5670
);
71+
drop(aligned_vec);
5772
versioned_hash
5873
}
5974
} else {

0 commit comments

Comments
 (0)