StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix(wayland/shm): don't leak fds on shm pool destruction

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-10-01 01:19:32 +02:00
parent 3edaaf2dfc
commit 6678681c2c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/core/shm_pool.rs
View File

@@ -5,16 +5,17 @@ use crate::wayland::{
}; };
use memmap2::{MmapOptions, RemapOptions}; use memmap2::{MmapOptions, RemapOptions};
use parking_lot::{Mutex, MutexGuard, RawMutex, lock_api::MappedMutexGuard}; use parking_lot::{Mutex, MutexGuard, RawMutex, lock_api::MappedMutexGuard};
use waynest_server::Client as _; use std::os::fd::{AsRawFd, OwnedFd};
use std::os::fd::{IntoRawFd, OwnedFd};
use waynest::ObjectId; use waynest::ObjectId;
use waynest_protocols::server::core::wayland::wl_shm::Format; use waynest_protocols::server::core::wayland::wl_shm::Format;
pub use waynest_protocols::server::core::wayland::wl_shm_pool::*; pub use waynest_protocols::server::core::wayland::wl_shm_pool::*;
use waynest_server::Client as _;
#[derive(Debug, waynest_server::RequestDispatcher)] #[derive(Debug, waynest_server::RequestDispatcher)]
#[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)] #[waynest(error = crate::wayland::WaylandError, connection = crate::wayland::Client)]
pub struct ShmPool { pub struct ShmPool {
inner: Mutex<memmap2::MmapMut>, inner: Mutex<memmap2::MmapMut>,
fd: OwnedFd,
id: ObjectId, id: ObjectId,
} }
@@ -24,11 +25,12 @@ impl ShmPool {
let map = unsafe { let map = unsafe {
MmapOptions::new() MmapOptions::new()
.len(size as usize) .len(size as usize)
.map_mut(fd.into_raw_fd())? .map_mut(fd.as_raw_fd())?
}; };
Ok(Self { Ok(Self {
inner: Mutex::new(map), inner: Mutex::new(map),
fd,
id, id,
}) })
} }