From dfed13bd9f8e7ac09ead1ec095fd15c77322941d Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Thu, 15 Oct 2020 11:58:23 +0800 Subject: [PATCH] shell: initialize the logstr before using it This fixes UB when accessing an uninitialized value. Signed-off-by: Sean Cross --- services/shell/src/logstr.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/services/shell/src/logstr.rs b/services/shell/src/logstr.rs index cc8e613f0..0cf54ea34 100644 --- a/services/shell/src/logstr.rs +++ b/services/shell/src/logstr.rs @@ -17,13 +17,22 @@ impl<'a> LogStr<'a> { ) .expect("couldn't allocate memory"); - let raw_slice = unsafe { slice::from_raw_parts_mut(mem.as_ptr() as *mut u8, 4096) }; + // Zero out the buffer. This is required to avoid UB when accessing + // "uninitialized" memory. + unsafe { + let ptr = mem.as_mut_ptr(); + for off in 0..mem.len() { + ptr.add(off).write_volatile(0); + } + } + + let raw_slice = unsafe { slice::from_raw_parts_mut(mem.as_mut_ptr(), mem.len()) }; LogStr { raw_slice, len: 0, string: unsafe { - core::str::from_utf8_unchecked(slice::from_raw_parts(mem.as_ptr() as *mut u8, 0)) + core::str::from_utf8_unchecked(slice::from_raw_parts(mem.as_ptr(), 0)) }, } } @@ -40,13 +49,6 @@ impl<'a> LogStr<'a> { } pub fn as_memory_message(&self, id: xous::MessageId) -> Result { - - print!("SHELL: String @ {:08x}:", self.raw_slice.as_ptr() as usize); - for offset in 0..self.len { - print!(" {:02x}", self.raw_slice[offset]); - } - println!(" (length: {})", self.len); - Ok(xous::MemoryMessage { id, buf: xous::MemoryRange::new(self.raw_slice.as_ptr() as usize, self.raw_slice.len()).unwrap(), @@ -67,8 +69,8 @@ impl<'a> LogStr<'a> { impl<'a> Write for LogStr<'a> { fn write_str(&mut self, s: &str) -> Result<(), Error> { - for c in s.bytes() { - self.raw_slice[self.len] = c; + for (dest, src) in self.raw_slice.iter_mut().skip(self.len).zip(s.bytes()) { + *dest = src; self.len += 1; } self.string = unsafe { core::str::from_utf8_unchecked(slice::from_raw_parts(self.raw_slice.as_ptr(), self.len)) };