Changeset 745 for trunk/server/source3/smbd/files.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/files.c (modified) (32 diffs)

trunk/server/source3/smbd/files.c

@@ -3 +3 @@
    Files[] structure handling
    Copyright (C) Andrew Tridgell 1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
+#include "util_tdb.h"
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
@@ -29 +32 @@
 ****************************************************************************/
 
-static unsigned long get_gen_count(void)
-{
-        if ((++file_gen_counter) == 0)
-                return ++file_gen_counter;
-        return file_gen_counter;
+static unsigned long get_gen_count(struct smbd_server_connection *sconn)
+{
+        sconn->file_gen_counter += 1;
+        if (sconn->file_gen_counter == 0) {
+                sconn->file_gen_counter += 1;
+        }
+        return sconn->file_gen_counter;
 }
 
@@ -43 +48 @@
                   files_struct **result)
 {
+        struct smbd_server_connection *sconn = conn->sconn;
         int i;
         files_struct *fsp;
@@ -52 +58 @@
            increases the chance that the errant client will get an error rather
            than causing corruption */
-        if (first_file == 0) {
-                first_file = (sys_getpid() ^ (int)time(NULL)) % real_max_open_files;
+        if (sconn->first_file == 0) {
+                sconn->first_file = (sys_getpid() ^ (int)time(NULL));
+                sconn->first_file %= sconn->real_max_open_files;
         }
 
         /* TODO: Port the id-tree implementation from Samba4 */
 
-        i = bitmap_find(file_bmap, first_file);
+        i = bitmap_find(sconn->file_bmap, sconn->first_file);
         if (i == -1) {
                 DEBUG(0,("ERROR! Out of file structures\n"));
@@ -69 +76 @@
         /*
          * Make a child of the connection_struct as an fsp can't exist
-         * indepenedent of a connection.
+         * independent of a connection.
          */
         fsp = talloc_zero(conn, struct files_struct);
@@ -91 +98 @@
 
         fsp->conn = conn;
-        fsp->fh->gen_id = get_gen_count();
+        fsp->fh->gen_id = get_gen_count(sconn);
         GetTimeOfDay(&fsp->open_time);
 
-        first_file = (i+1) % real_max_open_files;
-
-        bitmap_set(file_bmap, i);
-        files_used++;
+        sconn->first_file = (i+1) % (sconn->real_max_open_files);
+
+        bitmap_set(sconn->file_bmap, i);
+        sconn->files_used += 1;
 
         fsp->fnum = i + FILE_HANDLE_OFFSET;
@@ -114 +121 @@
         }
 
-        DLIST_ADD(Files, fsp);
+        DLIST_ADD(sconn->files, fsp);
 
         DEBUG(5,("allocated file structure %d, fnum = %d (%d used)\n",
-                 i, fsp->fnum, files_used));
+                 i, fsp->fnum, sconn->files_used));
 
         if (req != NULL) {
@@ -128 +135 @@
           a cache hit to the *end* of the list. */
 
-        ZERO_STRUCT(fsp_fi_cache);
+        ZERO_STRUCT(sconn->fsp_fi_cache);
 
         conn->num_files_open++;
@@ -143 +150 @@
 {
         files_struct *fsp, *next;
-        
-        for (fsp=Files;fsp;fsp=next) {
+
+        for (fsp=conn->sconn->files; fsp; fsp=next) {
                 next = fsp->next;
                 if (fsp->conn == conn) {
@@ -156 +163 @@
 ****************************************************************************/
 
-void file_close_pid(uint16 smbpid, int vuid)
+void file_close_pid(struct smbd_server_connection *sconn, uint16 smbpid,
+                    int vuid)
 {
         files_struct *fsp, *next;
-        
-        for (fsp=Files;fsp;fsp=next) {
+
+        for (fsp=sconn->files;fsp;fsp=next) {
                 next = fsp->next;
                 if ((fsp->file_pid == smbpid) && (fsp->vuid == vuid)) {
@@ -172 +180 @@
 ****************************************************************************/
 
-void file_init(void)
+bool file_init(struct smbd_server_connection *sconn)
 {
         int request_max_open_files = lp_max_open_files();
@@ -184 +192 @@
         real_lim = set_maxfiles(request_max_open_files + MAX_OPEN_FUDGEFACTOR);
 
-        real_max_open_files = real_lim - MAX_OPEN_FUDGEFACTOR;
-
-        if (real_max_open_files + FILE_HANDLE_OFFSET + MAX_OPEN_PIPES > 65536)
-                real_max_open_files = 65536 - FILE_HANDLE_OFFSET - MAX_OPEN_PIPES;
-
-        if(real_max_open_files != request_max_open_files) {
-                DEBUG(1,("file_init: Information only: requested %d \
-open files, %d are available.\n", request_max_open_files, real_max_open_files));
-        }
-
-        SMB_ASSERT(real_max_open_files > 100);
-
-        file_bmap = bitmap_allocate(real_max_open_files);
-        
-        if (!file_bmap) {
-                exit_server("out of memory in file_init");
-        }
+        sconn->real_max_open_files = real_lim - MAX_OPEN_FUDGEFACTOR;
+
+        if (sconn->real_max_open_files + FILE_HANDLE_OFFSET + MAX_OPEN_PIPES
+            > 65536)
+                sconn->real_max_open_files =
+                        65536 - FILE_HANDLE_OFFSET - MAX_OPEN_PIPES;
+
+        if(sconn->real_max_open_files != request_max_open_files) {
+                DEBUG(1, ("file_init: Information only: requested %d "
+                          "open files, %d are available.\n",
+                          request_max_open_files, sconn->real_max_open_files));
+        }
+
+        SMB_ASSERT(sconn->real_max_open_files > 100);
+
+        sconn->file_bmap = bitmap_talloc(sconn, sconn->real_max_open_files);
+
+        if (!sconn->file_bmap) {
+                return false;
+        }
+        return true;
 }
 
@@ -207 +219 @@
 ****************************************************************************/
 
-void file_close_user(int vuid)
+void file_close_user(struct smbd_server_connection *sconn, int vuid)
 {
         files_struct *fsp, *next;
 
-        for (fsp=Files;fsp;fsp=next) {
+        for (fsp=sconn->files; fsp; fsp=next) {
                 next=fsp->next;
                 if (fsp->vuid == vuid) {
@@ -223 +235 @@
  */
 
-struct files_struct *file_walk_table(
+struct files_struct *files_forall(
+        struct smbd_server_connection *sconn,
         struct files_struct *(*fn)(struct files_struct *fsp,
                                    void *private_data),
@@ -230 +243 @@
         struct files_struct *fsp, *next;
 
-        for (fsp = Files; fsp; fsp = next) {
+        for (fsp = sconn->files; fsp; fsp = next) {
                 struct files_struct *ret;
                 next = fsp->next;
@@ -242 +255 @@
 
 /****************************************************************************
- Debug to enumerate all open files in the smbd.
-****************************************************************************/
-
-void file_dump_open_table(void)
+ Find a fsp given a file descriptor.
+****************************************************************************/
+
+files_struct *file_find_fd(struct smbd_server_connection *sconn, int fd)
 {
         int count=0;
         files_struct *fsp;
 
-        for (fsp=Files;fsp;fsp=fsp->next,count++) {
-                DEBUG(10,("Files[%d], fnum = %d, name %s, fd = %d, gen = %lu, "
-                          "fileid=%s\n", count, fsp->fnum, fsp_str_dbg(fsp),
-                          fsp->fh->fd, (unsigned long)fsp->fh->gen_id,
-                          file_id_string_tos(&fsp->file_id)));
-        }
-}
-
-/****************************************************************************
- Find a fsp given a file descriptor.
-****************************************************************************/
-
-files_struct *file_find_fd(int fd)
-{
-        int count=0;
-        files_struct *fsp;
-
-        for (fsp=Files;fsp;fsp=fsp->next,count++) {
+        for (fsp=sconn->files; fsp; fsp=fsp->next,count++) {
                 if (fsp->fh->fd == fd) {
                         if (count > 10) {
-                                DLIST_PROMOTE(Files, fsp);
+                                DLIST_PROMOTE(sconn->files, fsp);
                         }
                         return fsp;
@@ -283 +279 @@
 ****************************************************************************/
 
-files_struct *file_find_dif(struct file_id id, unsigned long gen_id)
+files_struct *file_find_dif(struct smbd_server_connection *sconn,
+                            struct file_id id, unsigned long gen_id)
 {
         int count=0;
         files_struct *fsp;
 
-        for (fsp=Files;fsp;fsp=fsp->next,count++) {
+        for (fsp=sconn->files; fsp; fsp=fsp->next,count++) {
                 /* We can have a fsp->fh->fd == -1 here as it could be a stat open. */
                 if (file_id_equal(&fsp->file_id, &id) &&
                     fsp->fh->gen_id == gen_id ) {
                         if (count > 10) {
-                                DLIST_PROMOTE(Files, fsp);
+                                DLIST_PROMOTE(sconn->files, fsp);
                         }
                         /* Paranoia check. */
@@ -316 +313 @@
 
 /****************************************************************************
- Check if an fsp still exists.
-****************************************************************************/
-
-files_struct *file_find_fsp(files_struct *orig_fsp)
-{
-        files_struct *fsp;
-
-        for (fsp=Files;fsp;fsp=fsp->next) {
-                if (fsp == orig_fsp)
-                        return fsp;
-        }
-
-        return NULL;
-}
-
-/****************************************************************************
  Find the first fsp given a device and inode.
  We use a singleton cache here to speed up searching from getfilepathinfo
@@ -337 +318 @@
 ****************************************************************************/
 
-files_struct *file_find_di_first(struct file_id id)
-{
-        files_struct *fsp;
-
-        if (file_id_equal(&fsp_fi_cache.id, &id)) {
+files_struct *file_find_di_first(struct smbd_server_connection *sconn,
+                                 struct file_id id)
+{
+        files_struct *fsp;
+
+        if (file_id_equal(&sconn->fsp_fi_cache.id, &id)) {
                 /* Positive or negative cache hit. */
-                return fsp_fi_cache.fsp;
-        }
-
-        fsp_fi_cache.id = id;
-
-        for (fsp=Files;fsp;fsp=fsp->next) {
+                return sconn->fsp_fi_cache.fsp;
+        }
+
+        sconn->fsp_fi_cache.id = id;
+
+        for (fsp=sconn->files;fsp;fsp=fsp->next) {
                 if (file_id_equal(&fsp->file_id, &id)) {
                         /* Setup positive cache. */
-                        fsp_fi_cache.fsp = fsp;
+                        sconn->fsp_fi_cache.fsp = fsp;
                         return fsp;
                 }
@@ -357 +339 @@
 
         /* Setup negative cache. */
-        fsp_fi_cache.fsp = NULL;
+        sconn->fsp_fi_cache.fsp = NULL;
         return NULL;
 }
@@ -379 +361 @@
 
 /****************************************************************************
- Find a fsp that is open for printing.
-****************************************************************************/
-
-files_struct *file_find_print(void)
-{
-        files_struct *fsp;
-
-        for (fsp=Files;fsp;fsp=fsp->next) {
-                if (fsp->print_file) {
-                        return fsp;
-                }
-        } 
-
-        return NULL;
-}
-
-/****************************************************************************
  Find any fsp open with a pathname below that of an already open path.
 ****************************************************************************/
@@ -415 +380 @@
         dlen = strlen(d_fullname);
 
-        for (fsp=Files;fsp;fsp=fsp->next) {
+        for (fsp=dir_fsp->conn->sconn->files; fsp; fsp=fsp->next) {
                 char *d1_fullname;
 
@@ -452 +417 @@
         files_struct *fsp, *next;
 
-        for (fsp=Files;fsp;fsp=next) {
+        for (fsp=conn->sconn->files; fsp; fsp=next) {
                 next=fsp->next;
                 if ((conn == fsp->conn) && (fsp->fh->fd != -1)) {
@@ -466 +431 @@
 void file_free(struct smb_request *req, files_struct *fsp)
 {
-        DLIST_REMOVE(Files, fsp);
+        struct smbd_server_connection *sconn = fsp->conn->sconn;
+
+        DLIST_REMOVE(sconn->files, fsp);
 
         TALLOC_FREE(fsp->fake_file_handle);
@@ -491 +458 @@
         TALLOC_FREE(fsp->update_write_time_event);
 
-        bitmap_clear(file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
-        files_used--;
+        bitmap_clear(sconn->file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
+        sconn->files_used--;
 
         DEBUG(5,("freed files structure %d (%d used)\n",
-                 fsp->fnum, files_used));
+                 fsp->fnum, sconn->files_used));
 
         fsp->conn->num_files_open--;
@@ -503 +470 @@
         }
 
+        /*
+         * Clear all possible chained fsp
+         * pointers in the SMB2 request queue.
+         */
+        if (req != NULL && req->smb2req) {
+                remove_smb2_chained_fsp(fsp);
+        }
+
         /* Closing a file can invalidate the positive cache. */
-        if (fsp == fsp_fi_cache.fsp) {
-                ZERO_STRUCT(fsp_fi_cache);
+        if (fsp == sconn->fsp_fi_cache.fsp) {
+                ZERO_STRUCT(sconn->fsp_fi_cache);
         }
 
@@ -525 +500 @@
 ****************************************************************************/
 
-files_struct *file_fnum(uint16 fnum)
+static struct files_struct *file_fnum(struct smbd_server_connection *sconn,
+                                      uint16 fnum)
 {
         files_struct *fsp;
         int count=0;
 
-        for (fsp=Files;fsp;fsp=fsp->next, count++) {
+        for (fsp=sconn->files; fsp; fsp=fsp->next, count++) {
                 if (fsp->fnum == fnum) {
                         if (count > 10) {
-                                DLIST_PROMOTE(Files, fsp);
+                                DLIST_PROMOTE(sconn->files, fsp);
                         }
                         return fsp;
@@ -542 +518 @@
 
 /****************************************************************************
- Get an fsp from a packet given the offset of a 16 bit fnum.
+ Get an fsp from a packet given a 16 bit fnum.
 ****************************************************************************/
 
@@ -549 +525 @@
         files_struct *fsp;
 
-        if ((req != NULL) && (req->chain_fsp != NULL)) {
+        if (req == NULL) {
+                /*
+                 * We should never get here. req==NULL could in theory
+                 * only happen from internal opens with a non-zero
+                 * root_dir_fid. Internal opens just don't do that, at
+                 * least they are not supposed to do so. And if they
+                 * start to do so, they better fake up a smb_request
+                 * from which we get the right smbd_server_conn. While
+                 * this should never happen, let's return NULL here.
+                 */
+                return NULL;
+        }
+
+        if (req->chain_fsp != NULL) {
                 return req->chain_fsp;
         }
 
-        fsp = file_fnum(fid);
-        if ((fsp != NULL) && (req != NULL)) {
+        fsp = file_fnum(req->sconn, fid);
+        if (fsp != NULL) {
                 req->chain_fsp = fsp;
         }
@@ -589 +578 @@
                 to->can_write = (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) ? True : False;
         }
-        to->print_file = from->print_file;
         to->modified = from->modified;
         to->is_directory = from->is_directory;
         to->aio_write_behind = from->aio_write_behind;
+
+        if (from->print_file) {
+                to->print_file = talloc(to, struct print_file_data);
+                if (!to->print_file) return NT_STATUS_NO_MEMORY;
+                to->print_file->rap_jobid = from->print_file->rap_jobid;
+        } else {
+                to->print_file = NULL;
+        }
+
         return fsp_set_smb_fname(to, from->fsp_name);
+}
+
+/**
+ * Return a jenkins hash of a pathname on a connection.
+ */
+
+NTSTATUS file_name_hash(connection_struct *conn,
+                        const char *name, uint32_t *p_name_hash)
+{
+        TDB_DATA key;
+        char *fullpath = NULL;
+
+        /* Set the hash of the full pathname. */
+        fullpath = talloc_asprintf(talloc_tos(),
+                        "%s/%s",
+                        conn->connectpath,
+                        name);
+        if (!fullpath) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        key = string_term_tdb_data(fullpath);
+        *p_name_hash = tdb_jenkins_hash(&key);
+
+        DEBUG(10,("file_name_hash: %s hash 0x%x\n",
+                fullpath,
+                (unsigned int)*p_name_hash ));
+
+        TALLOC_FREE(fullpath);
+        return NT_STATUS_OK;
 }
 
@@ -613 +639 @@
         fsp->fsp_name = smb_fname_new;
 
-        return NT_STATUS_OK;
-}
+        return file_name_hash(fsp->conn,
+                        smb_fname_str_dbg(fsp->fsp_name),
+                        &fsp->name_hash);
+}