mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-02 12:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

kratart: fix channels after u32::MAX worth of data

Browse Source
This commit is contained in:
Alex Zenla 2024-03-28 08:55:59 +00:00
parent f7267e4f5d
commit 567fcc296e
No known key found for this signature in database
GPG Key ID: 067B238899B51269
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/kratart/src/channel.rs
View File

@ -423,12 +423,12 @@ impl KrataChannelBackendProcessor {
if space > XenConsoleInterface::INPUT_SIZE { if space > XenConsoleInterface::INPUT_SIZE {
error!("channel for domid {} has an invalid input space of {}", self.domid, space); error!("channel for domid {} has an invalid input space of {}", self.domid, space);
} }
let free = XenConsoleInterface::INPUT_SIZE - space; let free = XenConsoleInterface::INPUT_SIZE.wrapping_sub(space);
let want = data.len().min(free); let want = data.len().min(free);
let buffer = &data[index..want]; let buffer = &data[index..want];
for b in buffer { for b in buffer {
unsafe { (*interface).input[prod as usize & (XenConsoleInterface::INPUT_SIZE - 1)] = *b; }; unsafe { (*interface).input[prod as usize & (XenConsoleInterface::INPUT_SIZE - 1)] = *b; };
prod += 1; prod = prod.wrapping_add(1);
} }
fence(Ordering::Release); fence(Ordering::Release);
unsafe { (*interface).in_prod = prod; }; unsafe { (*interface).in_prod = prod; };
@ -478,7 +478,7 @@ impl KrataChannelBackendProcessor {
let mut cons = (*interface).out_cons; let mut cons = (*interface).out_cons;
let prod = (*interface).out_prod; let prod = (*interface).out_prod;
fence(Ordering::Release); fence(Ordering::Release);
let size = prod - cons; let size = prod.wrapping_sub(cons);
let mut data: Vec<u8> = Vec::new(); let mut data: Vec<u8> = Vec::new();
if size == 0 || size as usize > XenConsoleInterface::OUTPUT_SIZE { if size == 0 || size as usize > XenConsoleInterface::OUTPUT_SIZE {
return Ok(data); return Ok(data);
@ -488,7 +488,7 @@ impl KrataChannelBackendProcessor {
break; break;
} }
data.push((*interface).output[cons as usize & (XenConsoleInterface::OUTPUT_SIZE - 1)]); data.push((*interface).output[cons as usize & (XenConsoleInterface::OUTPUT_SIZE - 1)]);
cons += 1; cons = cons.wrapping_add(1);
} }
fence(Ordering::AcqRel); fence(Ordering::AcqRel);
(*interface).out_cons = cons; (*interface).out_cons = cons;