Attachment 6433 Details for Bug 8111 – git-am fix for 3.5.next

[patch] git-am fix for 3.5.next

0001-Fix-bug-8111-CIFS-VFS-unexpected-error-on-SMB-posix-.patch (text/plain), 2.94 KB, created by Jeremy Allison on 2011-04-29 21:25:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-04-29 21:25:26 UTC

Size: 2.94 KB

patch

obsolete

>From 4e46bbc74923c89a5af06b959a1a9bba6e46e801 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 29 Apr 2011 14:22:54 -0700
>Subject: [PATCH] Fix bug 8111 - CIFS VFS: unexpected error on SMB posix open
>
>We are conflating the O_CREAT|O_EXCL with the O_TRUNC
>processing, they need to be separate. We need to chose
>using (O_CREAT|O_EXCL) first, then modify if O_TRUNC is
>set. This needs two separate switch statements.
>
>Jeremy
>---
> source3/smbd/trans2.c |   61 +++++++++++++++++++++++++++++++++++++++---------
> 1 files changed, 49 insertions(+), 12 deletions(-)
>
>diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
>index 1a171d8..0d14421 100644
>--- a/source3/smbd/trans2.c
>+++ b/source3/smbd/trans2.c
>@@ -7045,18 +7045,55 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
> 
> 	wire_open_mode &= ~SMB_ACCMODE;
> 
>-	if((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL)) == (SMB_O_CREAT | SMB_O_EXCL)) {
>-		create_disp = FILE_CREATE;
>-	} else if((wire_open_mode & (SMB_O_CREAT | SMB_O_TRUNC)) == (SMB_O_CREAT | SMB_O_TRUNC)) {
>-		create_disp = FILE_OVERWRITE_IF;
>-	} else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) {
>-		create_disp = FILE_OPEN_IF;
>-	} else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) {
>-		create_disp = FILE_OPEN;
>-	} else {
>-		DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",
>-			(unsigned int)wire_open_mode ));
>-		return NT_STATUS_INVALID_PARAMETER;
>+	/* First take care of O_CREAT|O_EXCL interactions. */
>+	switch (wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL)) {
>+		case (SMB_O_CREAT | SMB_O_EXCL):
>+			/* File exists fail. File not exist create. */
>+			create_disp = FILE_CREATE;
>+			break;
>+		case SMB_O_CREAT:
>+			/* File exists open. File not exist create. */
>+			create_disp = FILE_OPEN_IF;
>+			break;
>+		case 0:
>+			/* File exists open. File not exist fail. */
>+			create_disp = FILE_OPEN;
>+			break;
>+		case SMB_O_EXCL:
>+			/* O_EXCL on its own without O_CREAT is undefined. */
>+		default:
>+			DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",
>+				(unsigned int)wire_open_mode ));
>+			return NT_STATUS_INVALID_PARAMETER;
>+	}
>+
>+	/* Next factor in the effects of O_TRUNC. */
>+	wire_open_mode &= ~(SMB_O_CREAT | SMB_O_EXCL);
>+
>+	if (wire_open_mode & SMB_O_TRUNC) {
>+		switch (create_disp) {
>+			case FILE_CREATE:
>+				/* (SMB_O_CREAT | SMB_O_EXCL | O_TRUNC) */
>+				/* Leave create_disp alone as
>+				   (O_CREAT|O_EXCL|O_TRUNC) == (O_CREAT|O_EXCL)
>+				*/
>+				/* File exists fail. File not exist create. */
>+				break;
>+			case FILE_OPEN_IF:
>+				/* SMB_O_CREAT | SMB_O_TRUNC */
>+				/* File exists overwrite. File not exist create. */
>+				create_disp = FILE_OVERWRITE_IF;
>+				break;
>+			case FILE_OPEN:
>+				/* SMB_O_TRUNC */
>+				/* File exists overwrite. File not exist fail. */
>+				create_disp = FILE_OVERWRITE;
>+				break;
>+			default:
>+				/* Cannot get here. */
>+				smb_panic("smb_posix_open: logic error");
>+				return NT_STATUS_INVALID_PARAMETER;
>+		}
> 	}
> 
> 	raw_unixmode = IVAL(pdata,8);
>-- 
>1.7.3.1
>

Flags:

jlayton: review+

Actions: View

Attachments on bug 8111: 6431 | 6432 | 6433