*/
#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))
#define FILE_HANDLE_OFFSET 0x1000
/****************************************************************************
- Return a unique number identifying this fsp over the life of this pid.
+ Return a unique number identifying this fsp over the life of this pid,
+ and try to make it as globally unique as possible.
+ See bug #8995 for the details.
****************************************************************************/
-static unsigned long get_gen_count(void)
+static unsigned long get_gen_count(struct smbd_server_connection *sconn)
{
- if ((++file_gen_counter) == 0)
- return ++file_gen_counter;
- return file_gen_counter;
+ /*
+ * While fsp->fh->gen_id is 'unsigned long' currently
+ * (which might by 8 bytes),
+ * there's some oplock code which truncates it to
+ * uint32_t(using IVAL()).
+ */
+ if (sconn->file_gen_counter == 0) {
+ sconn->file_gen_counter = generate_random();
+ }
+ sconn->file_gen_counter += 1;
+ if (sconn->file_gen_counter >= UINT32_MAX) {
+ sconn->file_gen_counter = 0;
+ }
+ if (sconn->file_gen_counter == 0) {
+ sconn->file_gen_counter += 1;
+ }
+ return sconn->file_gen_counter;
}
/****************************************************************************
NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
files_struct **result)
{
+ struct smbd_server_connection *sconn = conn->sconn;
int i;
files_struct *fsp;
NTSTATUS status;
reuse a file descriptor from an earlier smb connection. This code
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"));
/* TODO: We have to unconditionally return a DOS error here,
fsp->fh->fd = -1;
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;
+ sconn->first_file = (i+1) % (sconn->real_max_open_files);
- bitmap_set(file_bmap, i);
- files_used++;
+ bitmap_set(sconn->file_bmap, i);
+ sconn->files_used += 1;
fsp->fnum = i + FILE_HANDLE_OFFSET;
SMB_ASSERT(fsp->fnum < 65536);
TALLOC_FREE(fsp->fh);
}
- DLIST_ADD(conn->sconn->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) {
req->chain_fsp = fsp;
at the start of the list and we search from
a cache hit to the *end* of the list. */
- ZERO_STRUCT(fsp_fi_cache);
+ ZERO_STRUCT(sconn->fsp_fi_cache);
conn->num_files_open++;
Initialise file structures.
****************************************************************************/
-void file_init(void)
+bool file_init(struct smbd_server_connection *sconn)
{
int request_max_open_files = lp_max_open_files();
int real_lim;
*/
real_lim = set_maxfiles(request_max_open_files + MAX_OPEN_FUDGEFACTOR);
- real_max_open_files = real_lim - MAX_OPEN_FUDGEFACTOR;
+ sconn->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 (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(real_max_open_files != request_max_open_files) {
+ 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, real_max_open_files));
+ request_max_open_files, sconn->real_max_open_files));
}
- SMB_ASSERT(real_max_open_files > 100);
+ SMB_ASSERT(sconn->real_max_open_files > 100);
- file_bmap = bitmap_talloc(talloc_autofree_context(),
- real_max_open_files);
+ sconn->file_bmap = bitmap_talloc(sconn, sconn->real_max_open_files);
- if (!file_bmap) {
- exit_server("out of memory in file_init");
+ if (!sconn->file_bmap) {
+ return false;
}
+ return true;
}
/****************************************************************************
Find a fsp given a file descriptor.
****************************************************************************/
-files_struct *file_find_fd(int fd)
+files_struct *file_find_fd(struct smbd_server_connection *sconn, int fd)
{
int count=0;
files_struct *fsp;
- for (fsp=smbd_server_conn->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(smbd_server_conn->files, fsp);
+ DLIST_PROMOTE(sconn->files, fsp);
}
return fsp;
}
int count=0;
files_struct *fsp;
+ if (gen_id == 0) {
+ return NULL;
+ }
+
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) &&
{
files_struct *fsp;
- if (file_id_equal(&fsp_fi_cache.id, &id)) {
+ if (file_id_equal(&sconn->fsp_fi_cache.id, &id)) {
/* Positive or negative cache hit. */
- return fsp_fi_cache.fsp;
+ return sconn->fsp_fi_cache.fsp;
}
- fsp_fi_cache.id = id;
+ 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;
}
}
/* Setup negative cache. */
- fsp_fi_cache.fsp = NULL;
+ sconn->fsp_fi_cache.fsp = NULL;
return NULL;
}
void file_free(struct smb_request *req, files_struct *fsp)
{
- DLIST_REMOVE(fsp->conn->sconn->files, fsp);
+ struct smbd_server_connection *sconn = fsp->conn->sconn;
+
+ DLIST_REMOVE(sconn->files, fsp);
TALLOC_FREE(fsp->fake_file_handle);
/* Ensure this event will never fire. */
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--;
}
/* 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);
}
/* Drop all remaining extensions. */
return req->chain_fsp;
}
- fsp = file_fnum(smbd_server_conn, fid);
+ fsp = file_fnum(req->sconn, fid);
if (fsp != NULL) {
req->chain_fsp = fsp;
}
return fsp;
}
+struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
+ uint64_t persistent_id,
+ uint64_t volatile_id)
+{
+ struct files_struct *fsp;
+
+ if (smb2req->compat_chain_fsp != NULL) {
+ return smb2req->compat_chain_fsp;
+ }
+
+ if (persistent_id != volatile_id) {
+ return NULL;
+ }
+
+ if (volatile_id > UINT16_MAX) {
+ return NULL;
+ }
+
+ fsp = file_fnum(smb2req->sconn, (uint16_t)volatile_id);
+ if (fsp == NULL) {
+ return NULL;
+ }
+
+ if (smb2req->tcon == NULL) {
+ return NULL;
+ }
+
+ if (smb2req->tcon->compat_conn != fsp->conn) {
+ return NULL;
+ }
+
+ if (smb2req->session == NULL) {
+ return NULL;
+ }
+
+ if (smb2req->session->vuid != fsp->vuid) {
+ return NULL;
+ }
+
+ smb2req->compat_chain_fsp = fsp;
+ return fsp;
+}
+
/****************************************************************************
Duplicate the file handle part for a DOS or FCB open.
****************************************************************************/
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;
+}
+
/**
* The only way that the fsp->fsp_name field should ever be set.
*/
TALLOC_FREE(fsp->fsp_name);
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);
}
git.samba.org / ddiss / samba.git / blobdiff