forked from M-Labs/artiq
1
0
Fork 0

firmware: fix another TOCTTOU race in sync/async RPC code.

This commit is contained in:
whitequark 2018-11-12 15:39:55 +00:00 committed by Sebastien Bourdeauducq
parent 68aad3e482
commit 248c1cf7dc
3 changed files with 21 additions and 1 deletions

View File

@ -518,6 +518,19 @@ pub unsafe fn main() {
attribute_writeback(typeinfo as *const ());
}
// Make sure all async RPCs are processed before exiting.
// Otherwise, if the comms and kernel CPU run in the following sequence:
//
// comms kernel
// ----------------------- -----------------------
// check for async RPC
// post async RPC
// post RunFinished
// check for mailbox
//
// the async RPC would be missed.
send(&RpcFlush);
send(&RunFinished);
loop {}

View File

@ -73,6 +73,7 @@ pub enum Message<'a> {
},
RpcRecvRequest(*mut ()),
RpcRecvReply(Result<usize, Exception<'a>>),
RpcFlush,
CacheGetRequest { key: &'a str },
CacheGetReply { value: &'static [i32] },

View File

@ -417,7 +417,13 @@ fn process_kern_message(io: &Io, mut stream: Option<&mut TcpStream>,
kern_acknowledge()
}
}
}
},
&kern::RpcFlush => {
// See ksupport/lib.rs for the reason this request exists.
// We do not need to do anything here because of how the main loop is
// structured.
kern_acknowledge()
},
&kern::CacheGetRequest { key } => {
let value = session.congress.cache.get(key);