diff options
| author | Jeremy Allison <jra@samba.org> | 2014-09-11 10:03:01 -0700 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-09-11 22:29:22 +0200 |
| commit | 518247bf80372eb003cb67036b9d9e7fe8aac303 (patch) | |
| tree | 82aab33e85e6befe118b1135e4ac37f83dbe9406 | |
| parent | 4e5a6b154e1549e959c5de4b58432e33c0d57b55 (diff) | |
| download | samba-518247bf80372eb003cb67036b9d9e7fe8aac303.tar.gz samba-518247bf80372eb003cb67036b9d9e7fe8aac303.tar.xz samba-518247bf80372eb003cb67036b9d9e7fe8aac303.zip | |
s3: smbd - open logic fix.
As we atomically create using O_CREAT|O_EXCL,
then if new_file_created is true, then
file_existed *MUST* have been false (even
if the file was previously detected as being
there.
We use the variable file_existed again in logic
below this statement, so we must set file_existed = false,
if new_file_created returns are true from open_file().
Based on a fix from Michael Adam.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10809
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Sep 11 22:29:22 CEST 2014 on sn-devel-104
| -rw-r--r-- | source3/smbd/open.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 6261a449d8..f077210a96 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2489,6 +2489,17 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, return fsp_open; } + if (new_file_created) { + /* + * As we atomically create using O_CREAT|O_EXCL, + * then if new_file_created is true, then + * file_existed *MUST* have been false (even + * if the file was previously detected as being + * there). + */ + file_existed = false; + } + if (file_existed && !check_same_dev_ino(&saved_stat, &smb_fname->st)) { /* * The file did exist, but some other (local or NFS) |