Changeset 862 for trunk/server/source3/smbd/open.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/open.c (modified) (6 diffs)

trunk/server/source3/smbd/open.c

@@ -59 +59 @@
         }
 
+        /*
+         * If we can access the path to this file, by
+         * default we have FILE_READ_ATTRIBUTES from the
+         * containing directory. See the section:
+         * "Algorithm to Check Access to an Existing File"
+         * in MS-FSA.pdf.
+         */
         return se_access_check(sd,
                                 token,
@@ -143 +150 @@
 
         return status;
+}
+
+/****************************************************************************
+ Ensure when opening a base file for a stream open that we have permissions
+ to do so given the access mask on the base file.
+****************************************************************************/
+
+static NTSTATUS check_base_file_access(struct connection_struct *conn,
+                                struct smb_filename *smb_fname,
+                                uint32_t access_mask)
+{
+        uint32_t access_granted = 0;
+        NTSTATUS status;
+
+        status = smbd_calculate_access_mask(conn, smb_fname,
+                                        false,
+                                        access_mask,
+                                        &access_mask);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(10, ("smbd_calculate_access_mask "
+                        "on file %s returned %s\n",
+                        smb_fname_str_dbg(smb_fname),
+                        nt_errstr(status)));
+                return status;
+        }
+
+        if (access_mask & (FILE_WRITE_DATA|FILE_APPEND_DATA)) {
+                uint32_t dosattrs;
+                if (!CAN_WRITE(conn)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                dosattrs = dos_mode(conn, smb_fname);
+                if (IS_DOS_READONLY(dosattrs)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+        }
+
+
+        return smbd_check_open_rights(conn,
+                                smb_fname,
+                                access_mask,
+                                &access_granted);
 }
 
@@ -1417 +1466 @@
                         }
 
-                        access_mask = access_granted;
+                        /*
+                         * If we can access the path to this file, by
+                         * default we have FILE_READ_ATTRIBUTES from the
+                         * containing directory. See the section.
+                         * "Algorithm to Check Access to an Existing File"
+                         * in MS-FSA.pdf.
+                         */
+                        access_mask = access_granted | FILE_READ_ATTRIBUTES;
                 } else {
                         access_mask = FILE_GENERIC_ALL;
@@ -1989 +2045 @@
                         /*
                          * If we're returning a share violation, ensure we
-                         * cope with the braindead 1 second delay.
+                         * cope with the braindead 1 second delay (SMB1 only).
                          */
 
                         if (!(oplock_request & INTERNAL_OPEN_ONLY) &&
+                            !conn->sconn->using_smb2 &&
                             lp_defer_sharing_violations()) {
                                 struct timeval timeout;
@@ -2753 +2810 @@
         mtimespec = smb_dname->st.st_ex_mtime;
 
-        /* Temporary access mask used to open the directory fd. */
-        fsp->access_mask = FILE_READ_DATA | FILE_READ_ATTRIBUTES;
+        fsp->access_mask = access_mask;
+
 #ifdef O_DIRECTORY
         status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0);
@@ -3213 +3270 @@
                         DEBUG(10, ("Unable to stat stream: %s\n",
                                    smb_fname_str_dbg(smb_fname_base)));
+                } else {
+                        /*
+                         * https://bugzilla.samba.org/show_bug.cgi?id=10229
+                         * We need to check if the requested access mask
+                         * could be used to open the underlying file (if
+                         * it existed), as we're passing in zero for the
+                         * access mask to the base filename.
+                         */
+                        status = check_base_file_access(conn,
+                                                        smb_fname_base,
+                                                        access_mask);
+
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(10, ("Permission check "
+                                        "for base %s failed: "
+                                        "%s\n", smb_fname->base_name,
+                                        nt_errstr(status)));
+                                goto fail;
+                        }
                 }