Attachment 13301 Details for Bug 12818 – git-am fix for 4.6.next, 4.5.next.

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

0001-s3-smbd-When-deleting-an-fsp-pointer-ensure-we-don-t.patch (text/plain), 1.15 KB, created by Jeremy Allison on 2017-06-21 22:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-06-21 22:49:41 UTC

Size: 1.15 KB

patch

obsolete

>From 232abcc93277b8c6235b1656bfcdcbac5688ed48 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 20 Jun 2017 11:20:38 -0700
>Subject: [PATCH] s3: smbd: When deleting an fsp pointer ensure we don't keep
> any references to it around.
>
>Based on a suggestion from <lev@zadarastorage.com>
>
>https://bugzilla.samba.org/show_bug.cgi?id=12818
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Thu Jun 22 00:12:49 CEST 2017 on sn-devel-144
>---
> source3/smbd/files.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/source3/smbd/files.c b/source3/smbd/files.c
>index 6d0f05b9db1..303ab7bb926 100644
>--- a/source3/smbd/files.c
>+++ b/source3/smbd/files.c
>@@ -552,9 +552,7 @@ void file_free(struct smb_request *req, files_struct *fsp)
> 	 * Clear all possible chained fsp
> 	 * pointers in the SMB2 request queue.
> 	 */
>-	if (req != NULL && req->smb2req) {
>-		remove_smb2_chained_fsp(fsp);
>-	}
>+	remove_smb2_chained_fsp(fsp);
> 
> 	/* Drop all remaining extensions. */
> 	vfs_remove_all_fsp_extensions(fsp);
>-- 
>2.11.0
>

Flags:

slow: review+

Actions: View

Attachments on bug 12818: 13252 | 13298 | 13301