Attachment 14115 Details for Bug 13372 – git-am fix for 4.7.next, 4.8.next.

[patch] git-am fix for 4.7.next, 4.8.next.

0001-s3-smbd-Fix-memory-leak-in-vfswrap_getwd.patch (text/plain), 1.27 KB, created by Jeremy Allison on 2018-04-09 21:12:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2018-04-09 21:12:47 UTC

Size: 1.27 KB

patch

obsolete

>From 7b3fbe9a90c0f4aefaf4bb8ce233087dbef18271 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 6 Apr 2018 13:52:52 -0700
>Subject: [PATCH] s3: smbd: Fix memory leak in vfswrap_getwd()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13372
>
>Signed-off-by: Andrew Walker <awalker@ixsystems.com>.
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Mon Apr  9 21:48:12 CEST 2018 on sn-devel-144
>
>(cherry picked from commit 461a1172ff819692aa0a2dc5ce7fc5379c8a529e)
>---
> source3/modules/vfs_default.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
>index a26bec457ae..a9c87e444fe 100644
>--- a/source3/modules/vfs_default.c
>+++ b/source3/modules/vfs_default.c
>@@ -2229,9 +2229,12 @@ static struct smb_filename *vfswrap_getwd(vfs_handle_struct *handle,
> 				NULL,
> 				NULL,
> 				0);
>-	if (smb_fname == NULL) {
>-		SAFE_FREE(result);
>-	}
>+	/*
>+	 * sys_getwd() *always* returns malloced memory.
>+	 * We must free here to avoid leaks:
>+	 * BUG:https://bugzilla.samba.org/show_bug.cgi?id=13372
>+	 */
>+	SAFE_FREE(result);
> 	return smb_fname;
> }
> 
>-- 
>2.17.0.484.g0c8726318c-goog
>

Flags:

slow: review+

Actions: View

Attachments on bug 13372: 14108 | 14109 | 14112 | 14115