Attachment 10285 Details for Bug 10797 – git-am fix for 4.1.next

[patch] git-am fix for 4.1.next

bug-10797.patchset (text/plain), 1.24 KB, created by Jeremy Allison on 2014-09-12 21:59:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2014-09-12 21:59:48 UTC

Size: 1.24 KB

patch

obsolete

>From c6e726f719e8c510fc51e681532183803f766ca0 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 9 Sep 2014 10:53:52 +0000
>Subject: [PATCH] s3: smbd: streams - Ensure share mode validation ignores
> internal opens (op_mid == 0).
>
>Fixes bug 10797 - smbd panic at find_oplock_types
>
>https://bugzilla.samba.org/show_bug.cgi?id=10797
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/open.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index f077210..7626b58 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -1110,7 +1110,7 @@ static void validate_my_share_entries(struct smbd_server_connection *sconn,
> 		return;
> 	}
> 
>-	if (share_entry->share_file_id == 0) {
>+	if (share_entry->op_mid == 0) {
> 		/* INTERNAL_OPEN_ONLY */
> 		return;
> 	}
>@@ -1291,6 +1291,11 @@ static bool validate_oplock_types(struct share_mode_lock *lck)
> 			continue;
> 		}
> 
>+		if (e->op_mid == 0) {
>+			/* INTERNAL_OPEN_ONLY */
>+			continue;
>+		}
>+
> 		if (e->op_type == NO_OPLOCK && is_stat_open(e->access_mask)) {
> 			/* We ignore stat opens in the table - they
> 			   always have NO_OPLOCK and never get or
>-- 
>2.1.0.rc2.206.gedb03e5
>

Flags:

vl: review+

Actions: View

Attachments on bug 10797: 10262 | 10285 | 10318