mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-29 06:54:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix memory safety hole around borrow

Browse source
This commit is contained in:
Jorge Aparicio 2017-04-13 22:57:06 -05:00
parent 692ad81ad8
commit 2fb00c7d85
3 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lib.rs
View file

@ -64,12 +64,15 @@ where
/// section /// section
/// ///
/// This operation is zero cost and doesn't impose any additional blocking /// This operation is zero cost and doesn't impose any additional blocking
pub fn borrow<'cs, SCEILING>( pub fn borrow<'cs, PRIORITY, SCEILING>(
&'static self, &'static self,
_priority: &P<PRIORITY>,
_system_ceiling: &'cs C<SCEILING>, _system_ceiling: &'cs C<SCEILING>,
) -> &'cs T ) -> &'cs T
where where
SCEILING: GreaterThanOrEqual<CEILING>, SCEILING: GreaterThanOrEqual<CEILING>,
CEILING: GreaterThanOrEqual<PRIORITY>,
P<PRIORITY>: Priority,
{ {
unsafe { &*self.data.get() } unsafe { &*self.data.get() }
} }
@ -216,12 +219,14 @@ where
C<CEILING>: Ceiling, C<CEILING>: Ceiling,
{ {
/// See [Resource.borrow](./struct.Resource.html#method.borrow) /// See [Resource.borrow](./struct.Resource.html#method.borrow)
pub fn borrow<'cs, SCEILING>( pub fn borrow<'cs, PRIORITY, SCEILING>(
&'static self, &'static self,
_priority: &P<PRIORITY>,
_system_ceiling: &'cs C<SCEILING>, _system_ceiling: &'cs C<SCEILING>,
) -> &'cs Periph ) -> &'cs Periph
where where
SCEILING: GreaterThanOrEqual<CEILING>, SCEILING: GreaterThanOrEqual<CEILING>,
CEILING: GreaterThanOrEqual<PRIORITY>,
{ {
unsafe { &*self.peripheral.get() } unsafe { &*self.peripheral.get() }
} }

27
tests/cfail/borrow.rs
View file

@ -1,22 +1,31 @@
extern crate cortex_m_srp; extern crate cortex_m_srp;
use cortex_m_srp::{C2, C3, C4, P1, Resource}; use cortex_m_srp::{C1, C2, C3, C4, C5, P2, Resource};
static R1: Resource<i32, C3> = Resource::new(0); static R1: Resource<i32, C4> = Resource::new(0);
static R2: Resource<i32, C2> = Resource::new(0); static R2: Resource<i32, C3> = Resource::new(0);
static R3: Resource<i32, C3> = Resource::new(0); static R3: Resource<i32, C4> = Resource::new(0);
static R4: Resource<i32, C4> = Resource::new(0); static R4: Resource<i32, C5> = Resource::new(0);
static R5: Resource<i32, C1> = Resource::new(0);
static R6: Resource<i32, C2> = Resource::new(0);
fn j1(prio: P1) { fn j1(prio: P2) {
R1.lock(&prio, |r1, c3| { R1.lock(&prio, |r1, c3| {
// CAN borrow a resource with ceiling C when the system ceiling SC > C // CAN borrow a resource with ceiling C when the system ceiling SC > C
let r2 = R2.borrow(&c3); let r2 = R2.borrow(&prio, &c3);
// CAN borrow a resource with ceiling C when the system ceiling SC == C // CAN borrow a resource with ceiling C when the system ceiling SC == C
let r3 = R3.borrow(&c3); let r3 = R3.borrow(&prio, &c3);
// CAN'T borrow a resource with ceiling C when the system ceiling SC < C // CAN'T borrow a resource with ceiling C when the system ceiling SC < C
let r4 = R4.borrow(&c3); let r4 = R4.borrow(&prio, &c3);
//~^ error //~^ error
// CAN'T borrow a resource with ceiling C < P (task priority)
let r5 = R5.borrow(&prio, &c3);
//~^ error
// CAN borrow a resource with ceiling C == P (task priority)
let r6 = R6.borrow(&prio, &c3);
}); });
} }

16
tests/cfail/lock_mut.rs
View file

@ -1,16 +0,0 @@
extern crate cortex_m_srp;
use cortex_m_srp::{C3, C4, P2, Resource};
static R1: Resource<i32, C4> = Resource::new(0);
static R2: Resource<i32, C3> = Resource::new(0);
fn j1(mut prio: P2) {
R1.lock_mut(
&mut prio, |r1: &mut i32, c3| {
let r2 = R2.borrow(&c3);
let another_r1: &i32 = R1.borrow(&c3);
//~^ error
}
);
}