From 3019bc6123aeb4814f387f1f97cd2981e8483214 Mon Sep 17 00:00:00 2001 From: occheung Date: Thu, 24 Oct 2024 11:52:04 +0800 Subject: [PATCH] runtime: check crc when flashing --- src/runtime/Cargo.toml.tpl | 1 + src/runtime/src/mgmt.rs | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/runtime/Cargo.toml.tpl b/src/runtime/Cargo.toml.tpl index c844131..e57e63e 100644 --- a/src/runtime/Cargo.toml.tpl +++ b/src/runtime/Cargo.toml.tpl @@ -21,6 +21,7 @@ cslice = "0.3" log = "0.4" embedded-hal = "0.2" core_io = { version = "0.1", features = ["collections"] } +crc = { version = "1.7", default-features = false } byteorder = { version = "1.3", default-features = false } void = { version = "1", default-features = false } futures = { version = "0.3", default-features = false, features = ["async-await"] } diff --git a/src/runtime/src/mgmt.rs b/src/runtime/src/mgmt.rs index d87ec50..f83cc94 100644 --- a/src/runtime/src/mgmt.rs +++ b/src/runtime/src/mgmt.rs @@ -1,6 +1,8 @@ use alloc::{rc::Rc, string::String, vec::Vec}; use core::cell::RefCell; +use byteorder::{ByteOrder, NativeEndian}; +use crc::crc32; use futures::{future::poll_fn, task::Poll}; use libasync::{smoltcp::TcpStream, task}; use libboard_artiq::{drtio_routing::RoutingTable, @@ -825,12 +827,27 @@ mod local_coremgmt { } pub async fn image_write(stream: &mut TcpStream, cfg: &Rc, image: Vec) -> Result<()> { - let value = cfg.write("boot", image); - if value.is_ok() { + let mut image = image.clone(); + let image_ref = &image[..]; + let bin_len = image.len() - 4; + + let (image_ref, expected_crc) = { + let (image_ref, crc_slice) = image_ref.split_at(bin_len); + (image_ref, NativeEndian::read_u32(crc_slice)) + }; + + let actual_crc = crc32::checksum_ieee(image_ref); + + if actual_crc == expected_crc { + info!("CRC passed. Writing boot image to SD card..."); + image.truncate(bin_len); + cfg.write("boot", image).expect("failed to write boot image"); reboot(stream).await?; } else { - // this is an error because we do not expect write to fail - error!("failed to write boot file: {:?}", value); + error!( + "CRC failed, images have not been written to flash.\n(actual {:08x}, expected {:08x})", + actual_crc, expected_crc + ); write_i8(stream, Reply::Error as i8).await?; } Ok(())