mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-05-02 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nosigbus' into 'main'

Browse source 
WIP: shm: use MAP_NOSIGBUS

See merge request wayland/wayland!145
This commit is contained in:
Simon Ser 2021-08-30 14:13:25 +00:00
commit 398a8e0eb7
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wayland-shm.c
View file

@ -49,6 +49,10 @@
#include "wayland-private.h"
#include "wayland-server.h"
#ifndef MAP_NOSIGBUS
#define MAP_NOSIGBUS 0x200000
#endif
/* This once_t is used to synchronize installing the SIGBUS handler
* and creating the TLS key. This will be done in the first call
* wl_shm_buffer_begin_access which can happen from any thread */
@ -294,7 +298,7 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource,
seals = 0;
pool->sigbus_is_impossible = (seals & F_SEAL_SHRINK) ? true : false;
#else
pool->sigbus_is_impossible = false;
pool->sigbus_is_impossible = true;
#endif
pool->internal_refcount = 1;
@ -302,7 +306,7 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource,
pool->size = size;
pool->new_size = size;
pool->data = mmap(NULL, size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
PROT_READ, MAP_PRIVATE | MAP_NOSIGBUS, fd, 0);
if (pool->data == MAP_FAILED) {
wl_resource_post_error(resource,
WL_SHM_ERROR_INVALID_FD,