Attachment 13703 Details for Bug 13090 – Patch for both 4.6 and 4.7

[patch] Patch for both 4.6 and 4.7

13090.txt (text/plain), 2.26 KB, created by Volker Lendecke on 2017-10-18 09:24:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2017-10-18 09:24:32 UTC

Size: 2.26 KB

patch

obsolete

>From f5aa464618e9dc657f106c44962f6696e842fd73 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 17 Oct 2017 11:28:36 +0200
>Subject: [PATCH 1/2] vfs_catia: Fix a memory leak
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13090
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>(cherry picked from commit e77b7aff86ab1cb603f59961f2f5689e4dc770ea)
>---
> source3/modules/vfs_catia.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
>index c47b64d8657..1dc1188d004 100644
>--- a/source3/modules/vfs_catia.c
>+++ b/source3/modules/vfs_catia.c
>@@ -2527,6 +2527,7 @@ static NTSTATUS catia_readdir_attr(struct vfs_handle_struct *handle,
> 	status = SMB_VFS_NEXT_READDIR_ATTR(handle, smb_fname, mem_ctx, pattr_data);
> 
> 	TALLOC_FREE(smb_fname);
>+	TALLOC_FREE(fname);
> 	return status;
> }
> 
>-- 
>2.11.0
>
>
>From cec5faa16741b21317e059b0977b6c8c3aec7bc0 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 16 Oct 2017 17:43:09 +0200
>Subject: [PATCH 2/2] vfs_catia: Fix a potential memleak
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Together with the previous commit this fixes a memleak (twice) that
>happens when vfs_catia is loaded with no mappings defined.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13090
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Tue Oct 17 18:53:48 CEST 2017 on sn-devel-144
>
>(cherry picked from commit f6d6af3b2d5efcd160c1e5e09778fb1129530be0)
>---
> source3/modules/vfs_catia.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
>index 1dc1188d004..6d000f2a79f 100644
>--- a/source3/modules/vfs_catia.c
>+++ b/source3/modules/vfs_catia.c
>@@ -245,7 +245,7 @@ static NTSTATUS catia_string_replace_allocate(connection_struct *conn,
> 
> 	if (!init_mappings(conn, &selected)) {
> 		/* No mappings found. Just use the old name */
>-		*mapped_name = talloc_strdup(NULL, name_in);
>+		*mapped_name = talloc_strdup(talloc_tos(), name_in);
> 		if (!*mapped_name) {
> 			errno = ENOMEM;
> 			return NT_STATUS_NO_MEMORY;
>-- 
>2.11.0
>

Flags:

slow: review+

Actions: View

Attachments on bug 13090: 13699 | 13703