frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xephyr: Call forgotten XShmDetach if can't mmap SHM segment 

Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Alexander Volkov 2018-02-02 15:17:15 +03:00 committed by Adam Jackson
parent 6b26a7bda9
commit 93c16b0524
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/kdrive/ephyr/hostx.c
View File

@ -457,8 +457,9 @@ hostx_create_shm_segment(xcb_shm_segment_info_t *shminfo, size_t size)
shminfo->shmseg = xcb_generate_id(HostX.conn); shminfo->shmseg = xcb_generate_id(HostX.conn);
cookie = xcb_shm_create_segment(HostX.conn, shminfo->shmseg, size, TRUE); cookie = xcb_shm_create_segment(HostX.conn, shminfo->shmseg, size, TRUE);
reply = xcb_shm_create_segment_reply(HostX.conn, cookie, &error); reply = xcb_shm_create_segment_reply(HostX.conn, cookie, &error);
if (!error && reply && reply->nfd == 1) { if (reply) {
int *fds = xcb_shm_create_segment_reply_fds(HostX.conn, reply); int *fds = reply->nfd == 1 ?
xcb_shm_create_segment_reply_fds(HostX.conn, reply) : NULL;
if (fds) { if (fds) {
shminfo->shmaddr = shminfo->shmaddr =
(uint8_t *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fds[0], 0); (uint8_t *)mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fds[0], 0);
@ -466,9 +467,12 @@ hostx_create_shm_segment(xcb_shm_segment_info_t *shminfo, size_t size)
if (shminfo->shmaddr == MAP_FAILED) if (shminfo->shmaddr == MAP_FAILED)
shminfo->shmaddr = NULL; shminfo->shmaddr = NULL;
} }
if (!shminfo->shmaddr)
xcb_shm_detach(HostX.conn, shminfo->shmseg);
free(reply);
} }
free(error); free(error);
free(reply);
} else { } else {
shminfo->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0666); shminfo->shmid = shmget(IPC_PRIVATE, size, IPC_CREAT|0666);
if (shminfo->shmid != -1) { if (shminfo->shmid != -1) {