Attachment 13180 Details for Bug 12760 – git-am fix for 4.6.next, 4.5.next.

[patch] git-am fix for 4.6.next, 4.5.next.

0001-s3-smbd-inotify_map_mask_to_filter-incorrectly-index.patch (text/plain), 1.08 KB, created by Jeremy Allison on 2017-04-28 16:01:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-04-28 16:01:36 UTC

Size: 1.08 KB

patch

obsolete

>From 6eb1d8fbd9e7ef27c80ce0a2a1905bb6ae7edde9 Mon Sep 17 00:00:00 2001
>From: Doug Nazar <nazard@nazar.ca>
>Date: Thu, 27 Apr 2017 15:41:24 -0700
>Subject: [PATCH] s3: smbd: inotify_map_mask_to_filter incorrectly indexes an
> array.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12760
>
>Signed-off-by: Doug Nazar <nazard@nazar.ca>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Christof Schmitt <cs@samba.org>
>(cherry picked from commit a939db725ea81944532ba3b035da0d145bc3b62a)
>---
> source3/smbd/notify_inotify.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
>index 3848dd67056..74855a9f6f9 100644
>--- a/source3/smbd/notify_inotify.c
>+++ b/source3/smbd/notify_inotify.c
>@@ -97,7 +97,7 @@ static uint32_t inotify_map_mask_to_filter(uint32_t mask)
> 	uint32_t filter = 0;
> 
> 	for (i = 0; i < ARRAY_SIZE(inotify_mapping); i++) {
>-		if (inotify_mapping[0].inotify_mask & mask) {
>+		if (inotify_mapping[i].inotify_mask & mask) {
> 			filter |= inotify_mapping[i].notify_mask;
> 		}
> 	}
>-- 
>2.13.0.rc0.306.g87b477812d-goog
>

Flags:

cs: review+
slow: review+

Actions: View

Attachments on bug 12760: 13180