fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rusticl: check the returned pointer of mmap
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Prior Linux 4.17 MAP_FIXED_NOREPLACE might not be respected and might
return a pointer different than the requested one.

Fixes: da4de8d7e3 ("rusticl: add support for coarse-grain buffer SVM")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35286>
This commit is contained in:
Karol Herbst 2025-06-02 18:26:45 +02:00 • committed by Marge Bot
parent 9b28067b59
commit fa94b1b29c
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/frontends/rusticl/core/context.rs
View file

@ -319,7 +319,7 @@ impl Context {
unreachable!("SVM supported only on Linux")
}
let res = unsafe {
let mut res = unsafe {
mmap(
vma.get() as usize as *mut c_void,
size.get() as usize,
@ -335,6 +335,14 @@ impl Context {
return Err(CL_OUT_OF_HOST_MEMORY);
}
if res as usize != vma.get() as usize {
unsafe {
let ret = munmap(res, size.get() as usize);
debug_assert_eq!(0, ret);
}
res = ptr::null_mut();
}
res.cast()
} else {
unsafe { alloc::alloc(layout) }.cast()