hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 12:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

wayland: consistently check mmap error after 6967a31450 (#6402)

Browse source 
mmap() returns MAP_FAILED on error, not nullptr.
This commit is contained in:
Jan Beich 2024-06-10 20:31:03 +00:00 committed by GitHub
parent ea2501d455
commit 811429bfd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/protocols/LinuxDMABUF.cpp
View file

@ -38,7 +38,7 @@ CCompiledDMABUFFeedback::CCompiledDMABUFFeedback(dev_t device, std::vector<SDMAB
auto arr = (SDMABUFFeedbackTableEntry*)mmap(nullptr, tableLen, PROT_READ | PROT_WRITE, MAP_SHARED, fds[0], 0); auto arr = (SDMABUFFeedbackTableEntry*)mmap(nullptr, tableLen, PROT_READ | PROT_WRITE, MAP_SHARED, fds[0], 0);
if (!arr) { if (arr == MAP_FAILED) {
LOGM(ERR, "mmap failed"); LOGM(ERR, "mmap failed");
close(fds[0]); close(fds[0]);
close(fds[1]); close(fds[1]);

4
src/protocols/core/Shm.cpp
View file

@ -97,7 +97,7 @@ void CSHMPool::resize(size_t size_) {
size = size_; size = size_;
data = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); data = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (!data) if (data == MAP_FAILED)
LOGM(ERR, "Couldn't mmap {} bytes from fd {} of shm client", size, fd); LOGM(ERR, "Couldn't mmap {} bytes from fd {} of shm client", size, fd);
} }
@ -146,7 +146,7 @@ CWLSHMPoolResource::CWLSHMPoolResource(SP<CWlShmPool> resource_, int fd_, size_t
RESOURCE->resource->buffer = RESOURCE; RESOURCE->resource->buffer = RESOURCE;
}); });
if (!pool->data) if (pool->data == MAP_FAILED)
resource->error(WL_SHM_ERROR_INVALID_FD, "Couldn't mmap from fd"); resource->error(WL_SHM_ERROR_INVALID_FD, "Couldn't mmap from fd");
} }