#include "smbd/globals.h"
#include "libcli/security/security.h"
#include "util_tdb.h"
-#include <ccan/hash/hash.h>
#include "lib/util/bitmap.h"
#define FILE_HANDLE_OFFSET 0x1000
-/****************************************************************************
- 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(struct smbd_server_connection *sconn)
-{
- /*
- * 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;
-}
-
/**
* create new fsp to be used for file_new or a durable handle reconnect
*/
goto fail;
}
+#if defined(HAVE_OFD_LOCKS)
+ fsp->use_ofd_locks = true;
+ if (lp_parm_bool(SNUM(conn),
+ "smbd",
+ "force process locks",
+ false)) {
+ fsp->use_ofd_locks = false;
+ }
+#endif
fsp->fh->ref_count = 1;
fsp->fh->fd = -1;
files_struct **result)
{
struct smbd_server_connection *sconn = conn->sconn;
- int i = -1;
files_struct *fsp;
NTSTATUS status;
GetTimeOfDay(&fsp->open_time);
- if (sconn->file_bmap != NULL) {
-
- /*
- * we want to give out file handles differently on each new
- * connection because of a common bug in MS clients where they
- * try to 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 (sconn->first_file == 0) {
- sconn->first_file = (getpid() ^ (int)time(NULL));
- sconn->first_file %= sconn->real_max_open_files;
- }
-
- /* TODO: Port the id-tree implementation from Samba4 */
-
- 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, W2k3 even returns ERRDOS/ERRnofids for
- * ntcreate&x with NTSTATUS negotiated
- */
- return NT_STATUS_TOO_MANY_OPENED_FILES;
+ if (req) {
+ struct smbXsrv_connection *xconn = req->xconn;
+ struct smbXsrv_open *op = NULL;
+ NTTIME now = timeval_to_nttime(&fsp->open_time);
+
+ status = smbXsrv_open_create(xconn,
+ conn->session_info,
+ now, &op);
+ if (!NT_STATUS_IS_OK(status)) {
+ file_free(NULL, fsp);
+ return status;
}
-
- sconn->first_file = (i+1) % (sconn->real_max_open_files);
-
- bitmap_set(sconn->file_bmap, i);
-
- fsp->fnum = i + FILE_HANDLE_OFFSET;
- SMB_ASSERT(fsp->fnum < 65536);
-
- fsp->fh->gen_id = get_gen_count(sconn);
+ fsp->op = op;
+ op->compat = fsp;
+ fsp->fnum = op->local_id;
+ fsp->fh->gen_id = smbXsrv_open_hash(op);
+ } else {
+ DEBUG(10, ("%s: req==NULL, INTERNAL_OPEN_ONLY, smbXsrv_open "
+ "allocated\n", __func__));
}
/*
* few NULL checks, so make sure it's initialized with something. to
* be safe until an audit can be done.
*/
- status = create_synthetic_smb_fname(fsp, "", NULL, NULL,
- &fsp->fsp_name);
- if (!NT_STATUS_IS_OK(status)) {
+ fsp->fsp_name = synthetic_smb_fname(fsp, "", NULL, NULL, 0);
+ if (fsp->fsp_name == NULL) {
file_free(NULL, fsp);
- return status;
+ return NT_STATUS_NO_MEMORY;
}
- DEBUG(5,("allocated file structure %d, fnum = %d (%u used)\n",
- i, fsp->fnum, (unsigned int)sconn->num_files));
+ DEBUG(5,("allocated file structure %s (%u used)\n",
+ fsp_fnum_dbg(fsp), (unsigned int)sconn->num_files));
if (req != NULL) {
+ fsp->mid = req->mid;
req->chain_fsp = fsp;
}
for (fsp=conn->sconn->files; fsp; fsp=next) {
next = fsp->next;
- if (fsp->conn == conn) {
- close_file(NULL, fsp, SHUTDOWN_CLOSE);
+ if (fsp->conn != conn) {
+ continue;
+ }
+ if (fsp->op != NULL && fsp->op->global->durable) {
+ /*
+ * A tree disconnect closes a durable handle
+ */
+ fsp->op->global->durable = false;
}
+ close_file(NULL, fsp, SHUTDOWN_CLOSE);
}
}
Close all open files for a pid and a vuid.
****************************************************************************/
-void file_close_pid(struct smbd_server_connection *sconn, uint16 smbpid,
+void file_close_pid(struct smbd_server_connection *sconn, uint16_t smbpid,
uint64_t vuid)
{
files_struct *fsp, *next;
sconn->real_max_open_files = files_max_open_fds;
- sconn->file_bmap = bitmap_talloc(sconn, sconn->real_max_open_files);
- if (!sconn->file_bmap) {
- return false;
- }
-
return true;
}
}
/* Paranoia check. */
if ((fsp->fh->fd == -1) &&
- (fsp->oplock_type != NO_OPLOCK) &&
- (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK)) {
+ (fsp->oplock_type != NO_OPLOCK &&
+ fsp->oplock_type != LEASE_OPLOCK)) {
DEBUG(0,("file_find_dif: file %s file_id = "
"%s, gen = %u oplock_type = %u is a "
"stat open with oplock type !\n",
return NULL;
}
+struct files_struct *file_find_one_fsp_from_lease_key(
+ struct smbd_server_connection *sconn,
+ const struct smb2_lease_key *lease_key)
+{
+ struct files_struct *fsp;
+
+ for (fsp = sconn->files; fsp; fsp=fsp->next) {
+ if ((fsp->lease != NULL) &&
+ (fsp->lease->lease.lease_key.data[0] ==
+ lease_key->data[0]) &&
+ (fsp->lease->lease.lease_key.data[1] ==
+ lease_key->data[1])) {
+ return fsp;
+ }
+ }
+ return NULL;
+}
+
/****************************************************************************
Find any fsp open with a pathname below that of an already open path.
****************************************************************************/
return false;
}
-/****************************************************************************
- Sync open files on a connection.
-****************************************************************************/
-
-void file_sync_all(connection_struct *conn)
-{
- files_struct *fsp, *next;
-
- for (fsp=conn->sconn->files; fsp; fsp=next) {
- next=fsp->next;
- if ((conn == fsp->conn) && (fsp->fh->fd != -1)) {
- sync_file(conn, fsp, True /* write through */);
- }
- }
-}
-
/****************************************************************************
Free up a fsp.
****************************************************************************/
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
+ if (fsp == sconn->fsp_fi_cache.fsp) {
+ ZERO_STRUCT(sconn->fsp_fi_cache);
+ }
+
DLIST_REMOVE(sconn->files, fsp);
SMB_ASSERT(sconn->num_files > 0);
sconn->num_files--;
fsp->fh->ref_count--;
}
+ if (fsp->lease != NULL) {
+ if (fsp->lease->ref_count == 1) {
+ TALLOC_FREE(fsp->lease);
+ } else {
+ fsp->lease->ref_count--;
+ }
+ }
+
fsp->conn->num_files_open--;
/* this is paranoia, just in case someone tries to reuse the
void file_free(struct smb_request *req, files_struct *fsp)
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
- int fnum = fsp->fnum;
+ uint64_t fnum = fsp->fnum;
if (fsp->notify) {
- struct notify_context *notify_ctx =
- fsp->conn->sconn->notify_ctx;
- notify_remove(notify_ctx, fsp);
+ size_t len = fsp_fullbasepath(fsp, NULL, 0);
+ char fullpath[len+1];
+
+ fsp_fullbasepath(fsp, fullpath, sizeof(fullpath));
+
+ /*
+ * Avoid /. at the end of the path name. notify can't
+ * deal with it.
+ */
+ if (len > 1 && fullpath[len-1] == '.' &&
+ fullpath[len-2] == '/') {
+ fullpath[len-2] = '\0';
+ }
+
+ notify_remove(fsp->conn->sconn->notify_ctx, fsp, fullpath);
TALLOC_FREE(fsp->notify);
}
/* Ensure this event will never fire. */
TALLOC_FREE(fsp->update_write_time_event);
- if (sconn->file_bmap != NULL) {
- bitmap_clear(sconn->file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
+ if (fsp->op != NULL) {
+ fsp->op->compat = NULL;
}
+ TALLOC_FREE(fsp->op);
if ((req != NULL) && (fsp == req->chain_fsp)) {
req->chain_fsp = NULL;
* 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 == sconn->fsp_fi_cache.fsp) {
- ZERO_STRUCT(sconn->fsp_fi_cache);
- }
+ remove_smb2_chained_fsp(fsp);
/* Drop all remaining extensions. */
vfs_remove_all_fsp_extensions(fsp);
fsp_free(fsp);
- DEBUG(5,("freed files structure %d (%u used)\n",
- fnum, (unsigned int)sconn->num_files));
-}
-
-/****************************************************************************
- Get an fsp from a 16 bit fnum.
-****************************************************************************/
-
-static struct files_struct *file_fnum(struct smbd_server_connection *sconn,
- uint16 fnum)
-{
- files_struct *fsp;
- int count=0;
-
- for (fsp=sconn->files; fsp; fsp=fsp->next, count++) {
- if (fsp->fnum == FNUM_FIELD_INVALID) {
- continue;
- }
-
- if (fsp->fnum == fnum) {
- if (count > 10) {
- DLIST_PROMOTE(sconn->files, fsp);
- }
- return fsp;
- }
- }
- return NULL;
+ DEBUG(5,("freed files structure %llu (%u used)\n",
+ (unsigned long long)fnum, (unsigned int)sconn->num_files));
}
/****************************************************************************
Get an fsp from a packet given a 16 bit fnum.
****************************************************************************/
-files_struct *file_fsp(struct smb_request *req, uint16 fid)
+files_struct *file_fsp(struct smb_request *req, uint16_t fid)
{
+ struct smbXsrv_open *op;
+ NTSTATUS status;
+ NTTIME now = 0;
files_struct *fsp;
if (req == NULL) {
}
if (req->chain_fsp != NULL) {
+ if (req->chain_fsp->deferred_close) {
+ return NULL;
+ }
return req->chain_fsp;
}
- fsp = file_fnum(req->sconn, fid);
- if (fsp != NULL) {
- req->chain_fsp = fsp;
+ if (req->xconn == NULL) {
+ return NULL;
}
- return fsp;
-}
-uint64_t fsp_persistent_id(const struct files_struct *fsp)
-{
- uint64_t persistent_id;
+ now = timeval_to_nttime(&req->request_time);
- /*
- * This calculates a number that is most likely
- * globally unique. In future we will have a database
- * to make it completely unique.
- *
- * 32-bit random gen_id
- * 16-bit truncated open_time
- * 16-bit fnum (valatile_id)
- */
- persistent_id = fsp->fh->gen_id & UINT32_MAX;
- persistent_id <<= 16;
- persistent_id &= 0x0000FFFFFFFF0000LLU;
- persistent_id |= fsp->open_time.tv_usec & UINT16_MAX;
- persistent_id <<= 16;
- persistent_id &= 0xFFFFFFFFFFFF0000LLU;
- persistent_id |= fsp->fnum & UINT16_MAX;
-
- return persistent_id;
+ status = smb1srv_open_lookup(req->xconn,
+ fid, now, &op);
+ if (!NT_STATUS_IS_OK(status)) {
+ return NULL;
+ }
+
+ fsp = op->compat;
+ if (fsp == NULL) {
+ return NULL;
+ }
+
+ if (fsp->deferred_close) {
+ return 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 *file_fsp_get(struct smbd_smb2_request *smb2req,
+ uint64_t persistent_id,
+ uint64_t volatile_id)
{
+ struct smbXsrv_open *op;
+ NTSTATUS status;
+ NTTIME now = 0;
struct files_struct *fsp;
- uint64_t fsp_persistent;
- if (smb2req->compat_chain_fsp != NULL) {
- return smb2req->compat_chain_fsp;
- }
+ now = timeval_to_nttime(&smb2req->request_time);
- if (volatile_id > UINT16_MAX) {
+ status = smb2srv_open_lookup(smb2req->xconn,
+ persistent_id, volatile_id,
+ now, &op);
+ if (!NT_STATUS_IS_OK(status)) {
return NULL;
}
- fsp = file_fnum(smb2req->sconn, (uint16_t)volatile_id);
+ fsp = op->compat;
if (fsp == NULL) {
return NULL;
}
- fsp_persistent = fsp_persistent_id(fsp);
- if (persistent_id != fsp_persistent) {
+ if (smb2req->tcon == NULL) {
return NULL;
}
- if (smb2req->tcon == NULL) {
+ if (smb2req->tcon->compat != fsp->conn) {
+ return NULL;
+ }
+
+ if (smb2req->session == NULL) {
return NULL;
}
- if (smb2req->tcon->compat_conn != fsp->conn) {
+ if (smb2req->session->compat == NULL) {
return NULL;
}
- if (smb2req->session == NULL) {
+ if (smb2req->session->compat->vuid != fsp->vuid) {
+ return NULL;
+ }
+
+ if (fsp->deferred_close) {
return NULL;
}
- if (smb2req->session->vuid != fsp->vuid) {
+ 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) {
+ if (smb2req->compat_chain_fsp->deferred_close) {
+ return NULL;
+ }
+ return smb2req->compat_chain_fsp;
+ }
+
+ fsp = file_fsp_get(smb2req, persistent_id, volatile_id);
+ if (fsp == NULL) {
return NULL;
}
****************************************************************************/
NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *from,
- uint32 access_mask, uint32 share_access,
- uint32 create_options, files_struct *to)
+ uint32_t access_mask, uint32_t share_access,
+ uint32_t create_options, files_struct *to)
{
/* this can never happen for print files */
SMB_ASSERT(from->print_file == NULL);
NTSTATUS file_name_hash(connection_struct *conn,
const char *name, uint32_t *p_name_hash)
{
- char *fullpath = NULL;
+ char tmpbuf[PATH_MAX];
+ char *fullpath, *to_free;
+ ssize_t len;
+ TDB_DATA key;
/* Set the hash of the full pathname. */
- fullpath = talloc_asprintf(talloc_tos(),
- "%s/%s",
- conn->connectpath,
- name);
- if (!fullpath) {
+
+ len = full_path_tos(conn->connectpath, name, tmpbuf, sizeof(tmpbuf),
+ &fullpath, &to_free);
+ if (len == -1) {
return NT_STATUS_NO_MEMORY;
}
- *p_name_hash = hash(fullpath, talloc_get_size(fullpath), 0);
+ key = (TDB_DATA) { .dptr = (uint8_t *)fullpath, .dsize = len+1 };
+ *p_name_hash = tdb_jenkins_hash(&key);
DEBUG(10,("file_name_hash: %s hash 0x%x\n",
- fullpath,
+ fullpath,
(unsigned int)*p_name_hash ));
- TALLOC_FREE(fullpath);
+ TALLOC_FREE(to_free);
return NT_STATUS_OK;
}
NTSTATUS fsp_set_smb_fname(struct files_struct *fsp,
const struct smb_filename *smb_fname_in)
{
- NTSTATUS status;
struct smb_filename *smb_fname_new;
- status = copy_smb_filename(fsp, smb_fname_in, &smb_fname_new);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
+ smb_fname_new = cp_smb_filename(fsp, smb_fname_in);
+ if (smb_fname_new == NULL) {
+ return NT_STATUS_NO_MEMORY;
}
TALLOC_FREE(fsp->fsp_name);
smb_fname_str_dbg(fsp->fsp_name),
&fsp->name_hash);
}
+
+const struct GUID *fsp_client_guid(const files_struct *fsp)
+{
+ return &fsp->conn->sconn->client->connections->smb2.client.guid;
+}
+
+size_t fsp_fullbasepath(struct files_struct *fsp, char *buf, size_t buflen)
+{
+ int len;
+
+ len = snprintf(buf, buflen, "%s/%s", fsp->conn->connectpath,
+ fsp->fsp_name->base_name);
+ SMB_ASSERT(len>0);
+
+ return len;
+}
git.samba.org / kai / samba-autobuild / .git / blobdiff