pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2026-01-11 16:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sound/pipewire: prevent unsigned sub overflow

Browse Source 
A subtraction between unsigned integers is made, which by default panics
on overflow. However, we don't really need to know the difference, only
that it is not zero or less.

Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
This commit is contained in:
Manos Pitsidianakis 2023-10-31 15:35:50 +02:00 committed by Viresh Kumar
parent 0f1eab60ec
commit 7255036df6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
staging/vhost-device-sound/src/audio_backends/pipewire.rs
View File

@ -3,7 +3,7 @@
use std::{
collections::HashMap,
convert::TryInto,
convert::TryFrom,
mem::size_of,
ptr,
sync::{Arc, RwLock},
@ -362,8 +362,10 @@ impl AudioBackend for PwBackend {
};
let mut buf_pos = buffer.pos;
let avail = (buffer.desc_len() as usize - buf_pos) as i32;
let n_bytes = n_samples.min(avail.try_into().unwrap());
let avail = usize::try_from(buffer.desc_len())
.unwrap()
.saturating_sub(buf_pos);
let n_bytes = n_samples.min(avail);
let p = &slice[start..start + n_bytes];
if buffer
@ -400,13 +402,15 @@ impl AudioBackend for PwBackend {
let mut start = buffer.pos;
let avail = (buffer.desc_len() - start as u32) as i32;
let avail = usize::try_from(buffer.desc_len())
.unwrap()
.saturating_sub(start);
if avail < n_bytes as i32 {
n_bytes = avail.try_into().unwrap();
if avail < n_bytes {
n_bytes = avail;
}
let p = &mut slice[0..n_bytes];
if avail <= 0 {
if avail == 0 {
// SAFETY: We have assured above that the pointer is not
// null
// safe to zero-initialize the pointer.