AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

wayland-shm: Check the size of sealed memory if ignoring SIGBUS handlers

Browse Source 
In 11623e8f, SIGBUS handlers aren't set if F_SEAL_SHRINK is configured on
the memory. This helps avoid setting up handlers with cooperative clients;
however, if an application gives an incorrect size, the compositor would
access it anyways, figuring SIGBUS is impossible, and crash.

This can be fixed by simply removing the seal-checking logic and always
setting the signal handler. However, it seems that fstat can give the size
of the memfd, so we can check that the size we were told is within the
region. Since it's sealed to shrinking, it must never be shrunk in future,
so we can really (hopefully) ignore SIGBUS.

I was worried that fstat wasn't supported for this, but shm_overview(7) does
mention that it is a possible use.

The best solution would likely be avoiding SIGBUS entirely with
MAP_NOSIGBUS, but that hasn't been merged yet and wouldn't help systems
without it (e.g. with older kernels).

A proof-of-concept of this crash is attached with the merge request. Running
it with this patch gives an invalid-shm error, which is correct.

Signed-off-by: Duncan McIntosh <duncan82013@live.ca>
This commit is contained in:
Duncan McIntosh 2021-10-16 20:28:34 -04:00 committed by Simon Ser
parent ebfc70cdf7
commit 20fd3b3af9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland-shm.c
View File

@ -38,6 +38,7 @@
#include <stdint.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
#include <signal.h>
@ -299,6 +300,7 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource,
uint32_t id, int fd, int32_t size)
{
struct wl_shm_pool *pool;
struct stat statbuf;
int seals;
int prot;
int flags;
@ -320,7 +322,11 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource,
seals = fcntl(fd, F_GET_SEALS);
if (seals == -1)
seals = 0;
pool->sigbus_is_impossible = (seals & F_SEAL_SHRINK) ? true : false;
if ((seals & F_SEAL_SHRINK) && fstat(fd, &statbuf) >= 0)
pool->sigbus_is_impossible = statbuf.st_size >= size;
else
pool->sigbus_is_impossible = false;
#else
pool->sigbus_is_impossible = false;
#endif