From c61c9c3a4cda79fb82adf59bcb563d85797b9b76 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 5 Mar 2010 15:10:30 -0800 Subject: Fix for bug #7189 - Open txt files with notepad on samba shares creates problem. Ensure we don't use any of the create_options for Samba private use. Add a new parameter to the VFS_CREATE call (private_flags) which is only used internally. Renumber NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to match the S4 code). Rev. the VFS interface to version 28. Jeremy. --- source3/smbd/nttrans.c | 4 ++++ source3/smbd/open.c | 55 +++++++++++++++++++++++++++++---------------- source3/smbd/reply.c | 18 +++++++++++++-- source3/smbd/smb2_create.c | 1 + source3/smbd/smb2_setinfo.c | 2 +- source3/smbd/trans2.c | 12 ++++++++-- source3/smbd/vfs.c | 4 +++- 7 files changed, 71 insertions(+), 25 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 656375499f..93621dde61 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -570,6 +570,7 @@ void reply_ntcreate_and_X(struct smb_request *req) file_attributes, /* file_attributes */ oplock_request, /* oplock_request */ allocation_size, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -1105,6 +1106,7 @@ static void call_nt_transact_create(connection_struct *conn, file_attributes, /* file_attributes */ oplock_request, /* oplock_request */ allocation_size, /* allocation_size */ + 0, /* private_flags */ sd, /* sd */ ea_list, /* ea_list */ &fsp, /* result */ @@ -1331,6 +1333,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx, FILE_ATTRIBUTE_NORMAL, /* file_attributes */ NO_OPLOCK, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp1, /* result */ @@ -1353,6 +1356,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx, fattr, /* file_attributes */ NO_OPLOCK, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp2, /* result */ diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 120de0f21a..fd9796dbf4 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -39,6 +39,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, uint32_t file_attributes, uint32_t oplock_request, uint64_t allocation_size, + uint32_t private_flags, struct security_descriptor *sd, struct ea_list *ea_list, @@ -1205,12 +1206,14 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname, uint32 *paccess_mask, uint32 *pshare_mode, uint32 *pcreate_disposition, - uint32 *pcreate_options) + uint32 *pcreate_options, + uint32_t *pprivate_flags) { uint32 access_mask; uint32 share_mode; uint32 create_disposition; uint32 create_options = FILE_NON_DIRECTORY_FILE; + uint32_t private_flags = 0; DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, " "open_func = 0x%x\n", @@ -1288,7 +1291,7 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname, break; case DENY_DOS: - create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS; + private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS; if (is_executable(smb_fname->base_name)) { share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE; } else { @@ -1301,7 +1304,7 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname, break; case DENY_FCB: - create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB; + private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB; share_mode = FILE_SHARE_NONE; break; @@ -1313,12 +1316,13 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname, DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, " "share_mode = 0x%x, create_disposition = 0x%x, " - "create_options = 0x%x\n", + "create_options = 0x%x private_flags = 0x%x\n", smb_fname_str_dbg(smb_fname), (unsigned int)access_mask, (unsigned int)share_mode, (unsigned int)create_disposition, - (unsigned int)create_options )); + (unsigned int)create_options, + (unsigned int)private_flags)); if (paccess_mask) { *paccess_mask = access_mask; @@ -1332,6 +1336,9 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname, if (pcreate_options) { *pcreate_options = create_options; } + if (pprivate_flags) { + *pprivate_flags = private_flags; + } return True; @@ -1449,6 +1456,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, uint32 new_dos_attributes, /* attributes used for new file. */ int oplock_request, /* internal Samba oplock codes. */ /* Information (FILE_EXISTS etc.) */ + uint32_t private_flags, /* Samba specific flags. */ int *pinfo, files_struct *fsp) { @@ -1517,10 +1525,11 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, DEBUG(10, ("open_file_ntcreate: fname=%s, dos_attrs=0x%x " "access_mask=0x%x share_access=0x%x " "create_disposition = 0x%x create_options=0x%x " - "unix mode=0%o oplock_request=%d\n", + "unix mode=0%o oplock_request=%d private_flags = 0x%x\n", smb_fname_str_dbg(smb_fname), new_dos_attributes, access_mask, share_access, create_disposition, - create_options, (unsigned int)unx_mode, oplock_request)); + create_options, (unsigned int)unx_mode, oplock_request, + (unsigned int)private_flags)); if ((req == NULL) && ((oplock_request & INTERNAL_OPEN_ONLY) == 0)) { DEBUG(0, ("No smb request but not an internal only open!\n")); @@ -1714,7 +1723,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, /* DENY_DOS opens are always underlying read-write on the file handle, no matter what the requested access mask says. */ - if ((create_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) || + if ((private_flags & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) || access_mask & (FILE_READ_ATTRIBUTES|FILE_READ_DATA|FILE_READ_EA|FILE_EXECUTE)) { flags = O_RDWR; } else { @@ -1763,7 +1772,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_fname->st); fsp->share_access = share_access; - fsp->fh->private_options = create_options; + fsp->fh->private_options = private_flags; fsp->access_mask = open_access_mask; /* We change this to the * requested access_mask after * the open is done. */ @@ -1831,7 +1840,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, /* Check if this can be done with the deny_dos and fcb * calls. */ - if (create_options & + if (private_flags & (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS| NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) { if (req == NULL) { @@ -2126,9 +2135,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, } } - /* Record the options we were opened with. */ - fsp->share_access = share_access; - fsp->fh->private_options = create_options; /* * According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted, */ @@ -2290,6 +2296,7 @@ NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn, 0, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -2594,7 +2601,7 @@ static NTSTATUS open_directory(connection_struct *conn, fsp->can_write = False; fsp->share_access = share_access; - fsp->fh->private_options = create_options; + fsp->fh->private_options = 0; /* * According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted, */ @@ -2678,6 +2685,7 @@ NTSTATUS create_directory(connection_struct *conn, struct smb_request *req, FILE_ATTRIBUTE_DIRECTORY, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -2847,10 +2855,11 @@ NTSTATUS open_streams_for_delete(connection_struct *conn, (FILE_SHARE_READ | /* share_access */ FILE_SHARE_WRITE | FILE_SHARE_DELETE), FILE_OPEN, /* create_disposition*/ - NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE, /* create_options */ + 0, /* create_options */ FILE_ATTRIBUTE_NORMAL, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &streams[i], /* result */ @@ -2900,6 +2909,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, uint32_t file_attributes, uint32_t oplock_request, uint64_t allocation_size, + uint32_t private_flags, struct security_descriptor *sd, struct ea_list *ea_list, @@ -2914,7 +2924,8 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, DEBUG(10,("create_file_unixpath: access_mask = 0x%x " "file_attributes = 0x%x, share_access = 0x%x, " "create_disposition = 0x%x create_options = 0x%x " - "oplock_request = 0x%x ea_list = 0x%p, sd = 0x%p, " + "oplock_request = 0x%x private_flags = 0x%x " + "ea_list = 0x%p, sd = 0x%p, " "fname = %s\n", (unsigned int)access_mask, (unsigned int)file_attributes, @@ -2922,6 +2933,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, (unsigned int)create_disposition, (unsigned int)create_options, (unsigned int)oplock_request, + (unsigned int)private_flags, ea_list, sd, smb_fname_str_dbg(smb_fname))); if (create_options & FILE_OPEN_BY_FILE_ID) { @@ -3000,7 +3012,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, if ((conn->fs_capabilities & FILE_NAMED_STREAMS) && is_ntfs_stream_smb_fname(smb_fname) - && (!(create_options & NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE))) { + && (!(private_flags & NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE))) { uint32 base_create_disposition; struct smb_filename *smb_fname_base = NULL; @@ -3038,7 +3050,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, | FILE_SHARE_WRITE | FILE_SHARE_DELETE, base_create_disposition, - 0, 0, 0, 0, NULL, NULL, + 0, 0, 0, 0, 0, NULL, NULL, &base_fsp, NULL); TALLOC_FREE(smb_fname_base); @@ -3113,6 +3125,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, create_options, file_attributes, oplock_request, + private_flags, &info, fsp); @@ -3382,6 +3395,7 @@ NTSTATUS create_file_default(connection_struct *conn, uint32_t file_attributes, uint32_t oplock_request, uint64_t allocation_size, + uint32_t private_flags, struct security_descriptor *sd, struct ea_list *ea_list, files_struct **result, @@ -3395,6 +3409,7 @@ NTSTATUS create_file_default(connection_struct *conn, "file_attributes = 0x%x, share_access = 0x%x, " "create_disposition = 0x%x create_options = 0x%x " "oplock_request = 0x%x " + "private_flags = 0x%x " "root_dir_fid = 0x%x, ea_list = 0x%p, sd = 0x%p, " "fname = %s\n", (unsigned int)access_mask, @@ -3403,6 +3418,7 @@ NTSTATUS create_file_default(connection_struct *conn, (unsigned int)create_disposition, (unsigned int)create_options, (unsigned int)oplock_request, + (unsigned int)private_flags, (unsigned int)root_dir_fid, ea_list, sd, smb_fname_str_dbg(smb_fname))); @@ -3467,7 +3483,8 @@ NTSTATUS create_file_default(connection_struct *conn, status = create_file_unixpath( conn, req, smb_fname, access_mask, share_access, create_disposition, create_options, file_attributes, - oplock_request, allocation_size, sd, ea_list, + oplock_request, allocation_size, private_flags, + sd, ea_list, &fsp, &info); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b1a4e31951..7147fbe1f2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1694,6 +1694,7 @@ void reply_open(struct smb_request *req) uint32 share_mode; uint32 create_disposition; uint32 create_options = 0; + uint32_t private_flags = 0; NTSTATUS status; bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true); TALLOC_CTX *ctx = talloc_tos(); @@ -1737,7 +1738,7 @@ void reply_open(struct smb_request *req) if (!map_open_params_to_ntcreate(smb_fname, deny_mode, OPENX_FILE_EXISTS_OPEN, &access_mask, &share_mode, &create_disposition, - &create_options)) { + &create_options, &private_flags)) { reply_force_doserror(req, ERRDOS, ERRbadaccess); goto out; } @@ -1754,6 +1755,7 @@ void reply_open(struct smb_request *req) dos_attr, /* file_attributes */ oplock_request, /* oplock_request */ 0, /* allocation_size */ + private_flags, NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -1853,6 +1855,7 @@ void reply_open_and_X(struct smb_request *req) uint32 share_mode; uint32 create_disposition; uint32 create_options = 0; + uint32_t private_flags = 0; TALLOC_CTX *ctx = talloc_tos(); START_PROFILE(SMBopenX); @@ -1910,7 +1913,8 @@ void reply_open_and_X(struct smb_request *req) if (!map_open_params_to_ntcreate(smb_fname, deny_mode, smb_ofun, &access_mask, &share_mode, &create_disposition, - &create_options)) { + &create_options, + &private_flags)) { reply_force_doserror(req, ERRDOS, ERRbadaccess); goto out; } @@ -1927,6 +1931,7 @@ void reply_open_and_X(struct smb_request *req) smb_attr, /* file_attributes */ oplock_request, /* oplock_request */ 0, /* allocation_size */ + private_flags, NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -2144,6 +2149,7 @@ void reply_mknew(struct smb_request *req) fattr, /* file_attributes */ oplock_request, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -2272,6 +2278,7 @@ void reply_ctemp(struct smb_request *req) fattr, /* file_attributes */ oplock_request, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -2472,6 +2479,7 @@ static NTSTATUS do_unlink(connection_struct *conn, FILE_ATTRIBUTE_NORMAL, 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -5341,6 +5349,7 @@ void reply_rmdir(struct smb_request *req) FILE_ATTRIBUTE_DIRECTORY, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -6038,6 +6047,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -6176,6 +6186,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -6396,6 +6407,7 @@ NTSTATUS copy_file(TALLOC_CTX *ctx, if (!map_open_params_to_ntcreate(smb_fname_dst_tmp, 0, ofun, NULL, NULL, &new_create_disposition, + NULL, NULL)) { status = NT_STATUS_INVALID_PARAMETER; goto out; @@ -6415,6 +6427,7 @@ NTSTATUS copy_file(TALLOC_CTX *ctx, FILE_ATTRIBUTE_NORMAL, /* file_attributes */ INTERNAL_OPEN_ONLY, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp1, /* result */ @@ -6443,6 +6456,7 @@ NTSTATUS copy_file(TALLOC_CTX *ctx, dosattrs, /* file_attributes */ INTERNAL_OPEN_ONLY, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp2, /* result */ diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 3cf8b185b0..bad0377226 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -611,6 +611,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, in_file_attributes, 0, /* oplock_request */ allocation_size, + 0, /* private_flags */ sec_desc, ea_list, &result, diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index a5193eba7a..f6dbf78c21 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -252,7 +252,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx, if ((file_info_level == SMB_SET_FILE_DISPOSITION_INFO) && in_input_buffer.length >= 1 && CVAL(in_input_buffer.data,0)) { - fsp->fh->private_options |= FILE_DELETE_ON_CLOSE; + fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE; DEBUG(3,("smbd_smb2_setinfo_send: " "Cancelling print job (%s)\n", diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index d24efc4dd0..1870cbca6e 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -983,6 +983,7 @@ static void call_trans2open(connection_struct *conn, uint32 share_mode; uint32 create_disposition; uint32 create_options = 0; + uint32_t private_flags = 0; TALLOC_CTX *ctx = talloc_tos(); /* @@ -1054,7 +1055,8 @@ static void call_trans2open(connection_struct *conn, if (!map_open_params_to_ntcreate(smb_fname, deny_mode, open_ofun, &access_mask, &share_mode, &create_disposition, - &create_options)) { + &create_options, + &private_flags)) { reply_nterror(req, NT_STATUS_ACCESS_DENIED); goto out; } @@ -1101,6 +1103,7 @@ static void call_trans2open(connection_struct *conn, open_attr, /* file_attributes */ oplock_request, /* oplock_request */ open_size, /* allocation_size */ + private_flags, NULL, /* sd */ ea_list, /* ea_list */ &fsp, /* result */ @@ -5581,6 +5584,7 @@ static NTSTATUS smb_set_file_size(connection_struct *conn, FILE_ATTRIBUTE_NORMAL, /* file_attributes */ FORCE_OPLOCK_BREAK_TO_NONE, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &new_fsp, /* result */ @@ -6494,6 +6498,7 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn, FILE_ATTRIBUTE_NORMAL, /* file_attributes */ FORCE_OPLOCK_BREAK_TO_NONE, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &new_fsp, /* result */ @@ -7003,6 +7008,7 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn, mod_unixmode, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -7177,6 +7183,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn, mod_unixmode, /* file_attributes */ oplock_request, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -7306,6 +7313,7 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn, FILE_FLAG_POSIX_SEMANTICS|0777, /* file_attributes */ 0, /* oplock_request */ 0, /* allocation_size */ + 0, /* private_flags */ NULL, /* sd */ NULL, /* ea_list */ &fsp, /* result */ @@ -7717,7 +7725,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn, * Doing a DELETE_ON_CLOSE should cancel a print job. */ if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) { - fsp->fh->private_options |= FILE_DELETE_ON_CLOSE; + fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE; DEBUG(3,("call_trans2setfilepathinfo: " "Cancelling print job (%s)\n", diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 94bdb1f495..e34454b08f 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -1230,6 +1230,7 @@ NTSTATUS smb_vfs_call_create_file(struct vfs_handle_struct *handle, uint32_t file_attributes, uint32_t oplock_request, uint64_t allocation_size, + uint32_t private_flags, struct security_descriptor *sd, struct ea_list *ea_list, files_struct **result, @@ -1239,7 +1240,8 @@ NTSTATUS smb_vfs_call_create_file(struct vfs_handle_struct *handle, return handle->fns->create_file( handle, req, root_dir_fid, smb_fname, access_mask, share_access, create_disposition, create_options, - file_attributes, oplock_request, allocation_size, sd, ea_list, + file_attributes, oplock_request, allocation_size, + private_flags, sd, ea_list, result, pinfo); } -- cgit