Attachment 13650 Details for Bug 12995 – get-am fix for master.

[patch] get-am fix for master.

0001-s3-smbd-Currently-if-getwd-fails-after-a-chdir-we-pa.patch (text/plain), 3.09 KB, created by Jeremy Allison on 2017-10-04 19:52:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-10-04 19:52:00 UTC

Size: 3.09 KB

patch

obsolete

>From f0e7f18244a6257798f7ec09531c6ab0b2afeeb9 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 4 Oct 2017 12:43:22 -0700
>Subject: [PATCH] s3: smbd: Currently if getwd() fails after a chdir(), we
> panic.
>
>Change this to return to the previous $cwd, and return -1 for the chdir().
>
>If the return to the previous $cwd fails, still panic as we
>can't return an unknown state.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13027
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/vfs.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 60 insertions(+), 7 deletions(-)
>
>diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
>index dc0d14dc82f..b0d059e78d5 100644
>--- a/source3/smbd/vfs.c
>+++ b/source3/smbd/vfs.c
>@@ -858,6 +858,8 @@ const char *vfs_readdirname(connection_struct *conn, void *p,
> int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname)
> {
> 	int ret;
>+	int saved_errno = 0;
>+	struct smb_filename *saved_cwd = NULL;
> 
> 	if (!LastDir) {
> 		LastDir = SMB_STRDUP("");
>@@ -872,23 +874,74 @@ int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname)
> 		return 0;
> 	}
> 
>+	if (conn->cwd_fname != NULL) {
>+		/*
>+		 * Save off where we are in case we need to return
>+		 * on vfs_GetWd() failure after successful SMB_VFS_CHDIR().
>+		 */
>+		saved_cwd = cp_smb_filename(conn, conn->cwd_fname);
>+		if (saved_cwd == NULL) {
>+			return -1;
>+		}
>+	}
>+
> 	DEBUG(4,("vfs_ChDir to %s\n", smb_fname->base_name));
> 
> 	ret = SMB_VFS_CHDIR(conn, smb_fname);
> 	if (ret == 0) {
>-		/* Global cache. */
>-		SAFE_FREE(LastDir);
>-		LastDir = SMB_STRDUP(smb_fname->base_name);
>-
>+		/*
>+		 * Always replace conn->cwd_fname. We
>+		 * don't know if it's been modified by
>+		 * VFS modules in the stack.
>+		 */
> 		/* conn cache. */
> 		TALLOC_FREE(conn->cwd_fname);
> 		conn->cwd_fname = vfs_GetWd(conn, conn);
> 		if (conn->cwd_fname == NULL) {
>-			smb_panic("con->cwd getwd failed\n");
>-			/* NOTREACHED */
>+			/*
>+			 * vfs_GetWd() failed.
>+			 * We must be able to read cwd.
>+			 * Return to original directory
>+			 * and return -1.
>+			 */
>+			saved_errno = errno;
>+
>+			if (saved_cwd == NULL) {
>+				/*
>+				 * Failed on the very first chdir()+getwd()
>+				 * for this connection. We can't
>+				 * continue.
>+				 */
>+				smb_panic("con->cwd getwd failed\n");
>+				/* NOTREACHED */
>+				return -1;
>+			}
>+
>+			/* Return to the previous $cwd. */
>+			ret = SMB_VFS_CHDIR(conn, saved_cwd);
>+			if (ret != 0) {
>+				smb_panic("con->cwd getwd failed\n");
>+				/* NOTREACHED */
>+				return -1;
>+			}
>+			/* Restore original conn->cwd_fname. */
>+			conn->cwd_fname = saved_cwd;
>+			errno = saved_errno;
>+			/* And fail the chdir(). */
> 			return -1;
> 		}
>-		DEBUG(4,("vfs_ChDir got %s\n",conn->cwd_fname->base_name));
>+		/* vfs_GetWd() succeeded. */
>+		/* Replace global cache. */
>+		SAFE_FREE(LastDir);
>+		LastDir = SMB_STRDUP(smb_fname->base_name);
>+
>+		DEBUG(4,("vfs_ChDir got %s\n", conn->cwd_fname->base_name));
>+	} else {
>+		saved_errno = errno;
>+	}
>+	TALLOC_FREE(saved_cwd);
>+	if (saved_errno != 0) {
>+		errno = saved_errno;
> 	}
> 	return ret;
> }
>-- 
>2.14.2.920.gcf0c67979c-goog
>

Actions: View

Attachments on bug 12995: 13513 | 13650 | 13683 | 13701 | 13702