From b27feb061936d191f456edc22b2f89d4fc172520 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 25 Apr 2022 22:09:04 +0200 Subject: executor: fix unsoundness in InterruptExecutor::start. The initial closure is not actually called in the interrupt, so this is illegally sending non-Send futures to the interrupt. Remove the closure, and return a SendSpawner instead. --- examples/nrf/src/bin/multiprio.rs | 10 ++++------ examples/stm32f3/src/bin/multiprio.rs | 10 ++++------ examples/stm32f4/src/bin/multiprio.rs | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) (limited to 'examples') diff --git a/examples/nrf/src/bin/multiprio.rs b/examples/nrf/src/bin/multiprio.rs index e69f87d85..54f6606a9 100644 --- a/examples/nrf/src/bin/multiprio.rs +++ b/examples/nrf/src/bin/multiprio.rs @@ -124,17 +124,15 @@ fn main() -> ! { let irq = interrupt::take!(SWI1_EGU1); irq.set_priority(interrupt::Priority::P6); let executor = EXECUTOR_HIGH.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_high())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_high())); // Medium-priority executor: SWI0_EGU0, priority level 7 let irq = interrupt::take!(SWI0_EGU0); irq.set_priority(interrupt::Priority::P7); let executor = EXECUTOR_MED.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_med())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_med())); // Low priority executor: runs in thread mode, using WFE/SEV let executor = EXECUTOR_LOW.put(Executor::new()); diff --git a/examples/stm32f3/src/bin/multiprio.rs b/examples/stm32f3/src/bin/multiprio.rs index 1c9401549..02380de72 100644 --- a/examples/stm32f3/src/bin/multiprio.rs +++ b/examples/stm32f3/src/bin/multiprio.rs @@ -124,17 +124,15 @@ fn main() -> ! { let irq = interrupt::take!(UART4); irq.set_priority(interrupt::Priority::P6); let executor = EXECUTOR_HIGH.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_high())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_high())); // Medium-priority executor: SWI0_EGU0, priority level 7 let irq = interrupt::take!(UART5); irq.set_priority(interrupt::Priority::P7); let executor = EXECUTOR_MED.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_med())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_med())); // Low priority executor: runs in thread mode, using WFE/SEV let executor = EXECUTOR_LOW.put(Executor::new()); diff --git a/examples/stm32f4/src/bin/multiprio.rs b/examples/stm32f4/src/bin/multiprio.rs index 1c9401549..02380de72 100644 --- a/examples/stm32f4/src/bin/multiprio.rs +++ b/examples/stm32f4/src/bin/multiprio.rs @@ -124,17 +124,15 @@ fn main() -> ! { let irq = interrupt::take!(UART4); irq.set_priority(interrupt::Priority::P6); let executor = EXECUTOR_HIGH.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_high())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_high())); // Medium-priority executor: SWI0_EGU0, priority level 7 let irq = interrupt::take!(UART5); irq.set_priority(interrupt::Priority::P7); let executor = EXECUTOR_MED.put(InterruptExecutor::new(irq)); - executor.start(|spawner| { - unwrap!(spawner.spawn(run_med())); - }); + let spawner = executor.start(); + unwrap!(spawner.spawn(run_med())); // Low priority executor: runs in thread mode, using WFE/SEV let executor = EXECUTOR_LOW.put(Executor::new()); -- cgit