Attachment 13598 Details for Bug 13032 – git-am fix for 4.7.0

[patch] git-am fix for 4.7.0

0001-vfs_streams_xattr-Fix-segfault-when-running-with-log.patch (text/plain), 1.84 KB, created by Jeremy Allison on 2017-09-14 16:30:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-09-14 16:30:31 UTC

Size: 1.84 KB

patch

obsolete

>From 3e1b4ca5bfc92cab69e329e2410ee7c72de7d3f9 Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Wed, 13 Sep 2017 16:23:53 -0700
>Subject: [PATCH] vfs_streams_xattr: Fix segfault when running with log level
> 10
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This happens when vfs_streams_xattr is loaded, log level is set to 10
>and the default stream of a file or directory is accessed. In that case
>streams_xattr_open does not allocate the stream_io fsp extension. The
>DBG_DEBUG message in streams_xattr_fstat tries to access the stream_io
>before checking for a NULL value, resulting in the crash. Fix this by
>moving the debug message after the check for a NULL pointer.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13032
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Thu Sep 14 10:58:12 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 1b6aa39fac0825b1f25fd62a6c67994b5c491170)
>---
> source3/modules/vfs_streams_xattr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
>index 1b0b577e097..f75f6a18dd6 100644
>--- a/source3/modules/vfs_streams_xattr.c
>+++ b/source3/modules/vfs_streams_xattr.c
>@@ -232,12 +232,12 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
> 	struct stream_io *io = (struct stream_io *)
> 		VFS_FETCH_FSP_EXTENSION(handle, fsp);
> 
>-	DBG_DEBUG("streams_xattr_fstat called for %s\n", fsp_str_dbg(io->fsp));
>-
> 	if (io == NULL || fsp->base_fsp == NULL) {
> 		return SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
> 	}
> 
>+	DBG_DEBUG("streams_xattr_fstat called for %s\n", fsp_str_dbg(io->fsp));
>+
> 	if (!streams_xattr_recheck(io)) {
> 		return -1;
> 	}
>-- 
>2.11.0
>

Flags:

slow: review+
cs: review+

Actions: View

Attachments on bug 13032: 13598 | 13599 | 13600