Attachment 10602 Details for Bug 11040 – git-am for 4.2 cherry-picked from master

[patch] git-am for 4.2 cherry-picked from master

fruit_mmap.patch (text/plain), 1.22 KB, created by Ralph Böhme on 2015-01-09 06:53:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2015-01-09 06:53:35 UTC

Size: 1.22 KB

patch

obsolete

>From 269d8820d5e0141b49db2966245b07462f7e6b76 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 8 Jan 2015 17:14:37 +0100
>Subject: [PATCH] vfs_fruit: mmap under FreeBSD needs PROT_READ
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>We memmove, which does read
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=11040
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph BÃ¶hme <rb@sernet.de>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 56e2384dfe29fd8f16b9d0cf7264f9bb8ed38966)
>---
> source3/modules/vfs_fruit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index 23a7f16..3a8df21 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -651,7 +651,7 @@ static int ad_convert(struct adouble *ad, int fd)
> 		ad_getentrylen(ad, ADEID_RFORK);
> 
> 	/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
>-	map = mmap(NULL, origlen, PROT_WRITE, MAP_SHARED, fd, 0);
>+	map = mmap(NULL, origlen, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> 	if (map == MAP_FAILED) {
> 		DEBUG(2, ("mmap AppleDouble: %s\n", strerror(errno)));
> 		rc = -1;
>-- 
>1.9.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 11040: 10602