Implement a software rollback protection policy in RoT update_server.

app/gimletlet/app-mgmt.toml

@@ -49,7 +49,7 @@ task-slots = ["sys", "user_leds"]
 
 [tasks.net]
 name = "task-net"
-stacksize = 3000
+stacksize = 8000
 priority = 3
 features = ["mgmt", "h753", "use-spi-core", "spi2"]
 max-sizes = {flash = 131072, ram = 16384, sram1_mac = 16384}

app/gimletlet/base-gimletlet2.toml

@@ -3,8 +3,6 @@ target = "thumbv7em-none-eabihf"
 chip = "../../chips/stm32h7"
 memory = "memory-large.toml"
 stacksize = 896
-epoch = 0
-version = 0
 fwid = true
 
 [kernel]

app/grapefruit/app.toml

@@ -4,8 +4,6 @@ target = "thumbv7em-none-eabihf"
 chip = "../../chips/stm32h7"
 memory = "memory-large.toml"
 stacksize = 896
-epoch = 0
-version = 0
 fwid = true
 
 [kernel]

app/lpc55xpresso/app.toml

@@ -48,7 +48,7 @@ start = true
 [tasks.update_server]
 name = "lpc55-update-server"
 priority = 3
-max-sizes = {flash = 26720, ram = 16704}
+max-sizes = {flash = 30368, ram = 16704}
 stacksize = 8192
 start = true
 sections = {bootstate = "usbsram"}

app/oxide-rot-1/app-dev.toml

@@ -8,8 +8,6 @@ board = "oxide-rot-1-selfsigned"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 0
-version = 0
 fwid = true
 
 [kernel]
@@ -53,7 +51,7 @@ start = true
 [tasks.update_server]
 name = "lpc55-update-server"
 priority = 3
-max-sizes = {flash = 26080, ram = 17000, usbsram = 4096}
+max-sizes = {flash = 30368, ram = 17344, usbsram = 4096}
 # TODO: Size this appropriately
 stacksize = 8192
 start = true

app/oxide-rot-1/app.toml

@@ -5,8 +5,6 @@ board = "oxide-rot-1"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 0
-version = 0
 fwid = true
 
 [kernel]

app/rot-carrier/app.toml

@@ -4,8 +4,6 @@ board = "rot-carrier-2"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 0
-version = 0
 fwid = true
 
 [kernel]

build/xtask/src/config.rs

@@ -24,10 +24,6 @@ struct RawConfig {
     board: String,
     chip: String,
     #[serde(default)]
-    epoch: u32,
-    #[serde(default)]
-    version: u32,
-    #[serde(default)]
     fwid: bool,
     memory: Option<String>,
     #[serde(default)]
@@ -50,8 +46,6 @@ pub struct Config {
     pub target: String,
     pub board: String,
     pub chip: String,
-    pub epoch: u32,
-    pub version: u32,
     pub fwid: bool,
     pub image_names: Vec<String>,
     pub signing: Option<RoTMfgSettings>,
@@ -174,8 +168,6 @@ impl Config {
             board: toml.board,
             image_names: img_names,
             chip: toml.chip,
-            epoch: toml.epoch,
-            version: toml.version,
             fwid: toml.fwid,
             signing: toml.signing,
             stacksize: toml.stacksize,
@@ -254,11 +246,6 @@ impl Config {
         let task_names =
             self.tasks.keys().cloned().collect::<Vec<_>>().join(",");
         env.insert("HUBRIS_TASKS".to_string(), task_names);
-        env.insert(
-            "HUBRIS_BUILD_VERSION".to_string(),
-            format!("{}", self.version),
-        );
-        env.insert("HUBRIS_BUILD_EPOCH".to_string(), format!("{}", self.epoch));
         env.insert("HUBRIS_BOARD".to_string(), self.board.to_string());
         env.insert(
             "HUBRIS_APP_TOML".to_string(),

build/xtask/src/dist.rs

@@ -1567,7 +1567,7 @@ fn build_kernel(
 /// Returns true if the header was found and updated,
 /// false otherwise.
 fn update_image_header(
-    cfg: &PackageConfig,
+    _cfg: &PackageConfig,
     input: &Path,
     output: &Path,
     map: &IndexMap<String, Range<u32>>,
@@ -1606,16 +1606,8 @@ fn update_image_header(
                 // `xtask build kernel`, we need a result from this calculation
                 // but `end` will be `None`. Substitute a placeholder:
                 let end = end.unwrap_or(flash.start);
-
                 let len = end - flash.start;
-
-                let header = abi::ImageHeader {
-                    version: cfg.toml.version,
-                    epoch: cfg.toml.epoch,
-                    magic: abi::HEADER_MAGIC,
-                    total_image_len: len,
-                    ..Default::default()
-                };
+                let header = abi::ImageHeader::new(len);
 
                 header
                     .write_to_prefix(

drv/lpc55-update-api/src/lib.rs

@@ -242,6 +242,16 @@ impl From<RotSlot> for SlotId {
     }
 }
 
+impl SlotId {
+    pub fn other(&self) -> SlotId {
+        if *self == SlotId::A {
+            SlotId::B
+        } else {
+            SlotId::A
+        }
+    }
+}
+
 impl TryFrom<u16> for SlotId {
     type Error = ();
     fn try_from(i: u16) -> Result<Self, Self::Error> {

drv/lpc55-update-server/build.rs

@@ -2,9 +2,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::fs::File;
-use std::io::Write;
-
 fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     build_util::expose_target_board();
     build_util::build_notifications()?;
@@ -18,15 +15,5 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
             "server_stub.rs",
             idol::server::ServerStyle::InOrder,
         )?;
-
-    let out = build_util::out_dir();
-    let mut ver_file = File::create(out.join("consts.rs")).unwrap();
-
-    let version: u32 = build_util::env_var("HUBRIS_BUILD_VERSION")?.parse()?;
-    let epoch: u32 = build_util::env_var("HUBRIS_BUILD_EPOCH")?.parse()?;
-
-    writeln!(ver_file, "const HUBRIS_BUILD_VERSION: u32 = {};", version)?;
-    writeln!(ver_file, "const HUBRIS_BUILD_EPOCH: u32 = {};", epoch)?;
-
     Ok(())
 }