Attachment 10429 Details for Bug 10918 – patch for 4-2-test, cherry-picked from master branch with extra bug tag

[patch] patch for 4-2-test, cherry-picked from master branch with extra bug tag

0001-btrfs-don-t-leak-opened-directory-handle.patch (text/plain), 1.98 KB, created by David Disseldorp on 2014-11-12 12:43:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2014-11-12 12:43:49 UTC

Size: 1.98 KB

patch

obsolete

>From f2279d2afcb7155a3772a0e4132eac271abcca88 Mon Sep 17 00:00:00 2001
>From: Noel Power <noel.power@suse.com>
>Date: Tue, 4 Nov 2014 16:52:49 +0100
>Subject: [PATCH] btrfs: don't leak opened directory handle
>
>Closing a directory handle file descriptor via close() is undefined,
>according to:
>http://pubs.opengroup.org/onlinepubs/9699919799/functions/dirfd.html
>
>Signed-off-by: Noel Power <noel.power@suse.com>
>Reviewed-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>(cherry picked from commit 6faef4d213e76077bdbaf83cf07f0261c11dc757)
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10918
>---
> source3/modules/vfs_btrfs.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
>index c1e17b3..5144239 100644
>--- a/source3/modules/vfs_btrfs.c
>+++ b/source3/modules/vfs_btrfs.c
>@@ -245,23 +245,29 @@ static NTSTATUS btrfs_get_compression(struct vfs_handle_struct *handle,
> 	int fd;
> 	bool opened = false;
> 	NTSTATUS status;
>+	DIR *dir = NULL;
> 
> 	if ((fsp != NULL) && (fsp->fh->fd != -1)) {
> 		fd = fsp->fh->fd;
> 	} else if (smb_fname != NULL) {
> 		if (S_ISDIR(smb_fname->st.st_ex_mode)) {
>-			DIR *dir = opendir(smb_fname->base_name);
>+			dir = opendir(smb_fname->base_name);
> 			if (dir == NULL) {
> 				return NT_STATUS_UNSUCCESSFUL;
> 			}
>+			opened = true;
> 			fd = dirfd(dir);
>+			if (fd < 0) {
>+				status = NT_STATUS_UNSUCCESSFUL;
>+				goto err_close;
>+			}
> 		} else {
> 			fd = open(smb_fname->base_name, O_RDONLY);
>+			if (fd < 0) {
>+				return NT_STATUS_UNSUCCESSFUL;
>+			}
>+			opened = true;
> 		}
>-		if (fd < 0) {
>-			return NT_STATUS_UNSUCCESSFUL;
>-		}
>-		opened = true;
> 	} else {
> 		return NT_STATUS_INVALID_PARAMETER;
> 	}
>@@ -281,7 +287,11 @@ static NTSTATUS btrfs_get_compression(struct vfs_handle_struct *handle,
> 	status = NT_STATUS_OK;
> err_close:
> 	if (opened) {
>-		close(fd);
>+		if (dir != NULL) {
>+			closedir(dir);
>+		} else {
>+			close(fd);
>+		}
> 	}
> 
> 	return status;
>-- 
>2.1.2
>

Flags:

jra: review+
asn: review+

Actions: View

Attachments on bug 10918: 10398 | 10429