From 6259f51dd9918eccc9697f3763d918f7c9b82b50 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 22 Apr 2000 00:33:16 +0000 Subject: This is a *big* checkin that may break some things, but implements the new open mechanism Andrew & I discussed. config.sub: configure: Included the QNX patch. include/vfs.h: smbd/vfs-wrap.c: smbd/vfs.c: Added ftruncate vfs call (needed). Note that we will also need locking calls in the vfs (to be added). lib/util_unistr.c: nmbd/nmbd_processlogon.c: Fix for NT domain logons causing nmbd to core dump. Also fix for sidsize DOS bug. locking/locking.c: Check value of ret before using it for memdup. printing/printing.c: Convert print_fsp_open to return an allocated fsp. rpc_server/srv_lsa.c: Fix for NT domain logons. I have removed all use of lp_share_modes() from the code (although I left the parameter in the table for backwards compatibility). It no longer makes sense for this to exist. smbd/close.c: Removed lp_share_modes(). smbd/fileio.c: Fixed parameters to unlock_share_entry call in panic code. smbd/files.c: Correctly set the unix_ERR_code to ERRnofids on fsp allocation fail. smbd/nttrans.c: smbd/reply.c: smbd/trans2.c: Changed all occurrences of open_file_shared/open_directory/ open_file_stat to return an fsp from the call. smbd/open.c: Changed all occurrences of open_file_shared/open_directory/ open_file_stat to return an fsp from the call. In addition I have fixed a long standing race condition in the deny mode processing w.r.t. two smbd's creating a file. Andrew, please note that your original idea of using open with O_EXCL in this case would not work (I went over the races very carefully) and so we must re-check deny modes *after* the open() call returns. This is because there is a race between the open with O_EXCL and the lock of the share mode entry. Imagine the case where the first smbd does the open with O_EXCL and a deny mode of DENY_ALL, but is pre-empted before it locks the share modes and creates the deny mode entry for DENY_ALL. A second smbd could then come in with O_RDONLY and a deny mode of DENY_NONE and the two opens would be allowed. The *only* way to fix this race is to lock the share modes after the open and then do the deny mode checks *after* this lock in the case where the file did not originally exist. This code will need extensive testing but seems to initially work. Jeremy. (This used to be commit ab0ecc39d688f16b9692fe90b991f0b89287070a) --- source3/smbd/close.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'source3/smbd/close.c') diff --git a/source3/smbd/close.c b/source3/smbd/close.c index c4d323b1ba..ec28ff3540 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -65,7 +65,8 @@ static void check_magic(files_struct *fsp,connection_struct *conn) /**************************************************************************** Common code to close a file or a directory. ****************************************************************************/ -static void close_filestruct(files_struct *fsp) + +void close_filestruct(files_struct *fsp) { connection_struct *conn = fsp->conn; @@ -106,19 +107,15 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close) return 0; } - if (lp_share_modes(SNUM(conn))) { - lock_share_entry_fsp(fsp); - del_share_mode(fsp); - } + lock_share_entry_fsp(fsp); + del_share_mode(fsp); + unlock_share_entry_fsp(fsp); if(EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) release_file_oplock(fsp); locking_close_file(fsp); - if (lp_share_modes(SNUM(conn))) - unlock_share_entry_fsp(fsp); - err = fd_close(conn, fsp); /* check for magic scripts */ -- cgit