Attachment 77654 Details for Bug 62988 – Alternative patch

[patch] Alternative patch

0001-shm-Don-t-force-the-shm-files-to-be-read-only.patch (text/plain), 1.34 KB, created by Tanu Kaskinen on 2013-04-09 08:34:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tanu Kaskinen

Created: 2013-04-09 08:34:02 UTC

Size: 1.34 KB

patch

obsolete

>From 601f5bbd7b38aff98e4b959cddd3f0c74a7cdf6f Mon Sep 17 00:00:00 2001
>From: Tanu Kaskinen <tanuk@iki.fi>
>Date: Tue, 9 Apr 2013 11:25:09 +0300
>Subject: [PATCH] shm: Don't force the shm files to be read-only
>
>Forcing the shm file to be read-only makes shm_unlink() fail on OS X.
>Thanks to Albert Zeyer for finding the bug.
>
>BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=62988
>---
> src/pulsecore/shm.c |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
>index 9f44df3..8aa34fa 100644
>--- a/src/pulsecore/shm.c
>+++ b/src/pulsecore/shm.c
>@@ -111,6 +111,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
>     pa_assert(m);
>     pa_assert(size > 0);
>     pa_assert(size <= MAX_SHM_SIZE);
>+    pa_assert(!(mode & ~0777));
>     pa_assert(mode >= 0600);
> 
>     /* Each time we create a new SHM area, let's first drop all stale
>@@ -151,7 +152,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
>         pa_random(&m->id, sizeof(m->id));
>         segment_name(fn, sizeof(fn), m->id);
> 
>-        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
>+        if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode)) < 0) {
>             pa_log("shm_open() failed: %s", pa_cstrerror(errno));
>             goto fail;
>         }
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 62988: 77309 | 77654

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.