Skip to content

Commit

Permalink
shm: fix shm fd size check before creating or resizing shm_pool (#8572)
Browse files Browse the repository at this point in the history
* protocols: fix shm fd size check before creating or resizing shm_pool

* added static to function
  • Loading branch information
nabil-otsmane authored Nov 25, 2024
1 parent cc38e7e commit 1930a95
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/protocols/core/Shm.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Shm.hpp"
#include <algorithm>
#include <sys/mman.h>
#include <sys/stat.h>
#include <drm_fourcc.h>
#include "../../render/Texture.hpp"
#include "../types/WLBuffer.hpp"
Expand Down Expand Up @@ -99,10 +100,25 @@ void CSHMPool::resize(size_t size_) {
LOGM(ERR, "Couldn't mmap {} bytes from fd {} of shm client", size, fd);
}

static int shmIsSizeValid(int fd, size_t size) {
struct stat st;
if (fstat(fd, &st) == -1) {
LOGM(ERR, "Couldn't get stat for fd {} of shm client", fd);
return 0;
}

return (size_t)st.st_size >= size;
}

CWLSHMPoolResource::CWLSHMPoolResource(SP<CWlShmPool> resource_, int fd_, size_t size_) : resource(resource_) {
if (!good())
return;

if (!shmIsSizeValid(fd_, size_)) {
resource_->error(-1, "The size of the file is not big enough for the shm pool");
return;
}

pool = makeShared<CSHMPool>(fd_, size_);

resource->setDestroy([this](CWlShmPool* r) { PROTO::shm->destroyResource(this); });
Expand All @@ -113,6 +129,11 @@ CWLSHMPoolResource::CWLSHMPoolResource(SP<CWlShmPool> resource_, int fd_, size_t
r->error(-1, "Shrinking a shm pool is illegal");
return;
}
if (!shmIsSizeValid(pool->fd, size_)) {
r->error(-1, "The size of the file is not big enough for the shm pool");
return;
}

pool->resize(size_);
});

Expand Down

0 comments on commit 1930a95

Please sign in to comment.