static double audit_timeout;
-static void smb_time_audit_log(const char *syscallname, double elapsed)
+static void smb_time_audit_log_msg(const char *syscallname, double elapsed,
+ const char *msg)
{
- DEBUG(0, ("WARNING: System call \"%s\" took unexpectedly long "
- "(%.2f seconds) -- Validate that file and storage "
+ DEBUG(0, ("WARNING: VFS call \"%s\" took unexpectedly long "
+ "(%.2f seconds) %s%s-- Validate that file and storage "
"subsystems are operating normally\n", syscallname,
- elapsed));
+ elapsed, (msg != NULL) ? msg : "",
+ (msg != NULL) ? " " : ""));
+}
+
+static void smb_time_audit_log(const char *syscallname, double elapsed)
+{
+ smb_time_audit_log_msg(syscallname, elapsed, NULL);
+}
+
+static void smb_time_audit_log_fsp(const char *syscallname, double elapsed,
+ const struct files_struct *fsp)
+{
+ char *base_name = NULL;
+ char *connectpath = NULL;
+ char *msg = NULL;
+
+ if (fsp == NULL) {
+ smb_time_audit_log(syscallname, elapsed);
+ return;
+ }
+ if (fsp->conn)
+ connectpath = fsp->conn->connectpath;
+ if (fsp->fsp_name)
+ base_name = fsp->fsp_name->base_name;
+
+ if (connectpath != NULL && base_name != NULL) {
+ msg = talloc_asprintf(talloc_tos(), "filename = \"%s/%s\"",
+ connectpath, base_name);
+ } else if (connectpath != NULL && base_name == NULL) {
+ msg = talloc_asprintf(talloc_tos(), "connectpath = \"%s\", "
+ "base_name = <NULL>",
+ connectpath);
+ } else if (connectpath == NULL && base_name != NULL) {
+ msg = talloc_asprintf(talloc_tos(), "connectpath = <NULL>, "
+ "base_name = \"%s\"",
+ base_name);
+ } else { /* connectpath == NULL && base_name == NULL */
+ msg = talloc_asprintf(talloc_tos(), "connectpath = <NULL>, "
+ "base_name = <NULL>");
+ }
+ smb_time_audit_log_msg(syscallname, elapsed, msg);
+ TALLOC_FREE(msg);
+}
+
+static void smb_time_audit_log_fname(const char *syscallname, double elapsed,
+ const char *fname)
+{
+ char cwd[PATH_MAX];
+ char *msg = NULL;
+
+ if (getcwd(cwd, sizeof(cwd)) == NULL) {
+ snprintf(cwd, sizeof(cwd), "<getcwd() error %d>", errno);
+ }
+ if (fname != NULL) {
+ msg = talloc_asprintf(talloc_tos(),
+ "cwd = \"%s\", filename = \"%s\"",
+ cwd, fname);
+ } else {
+ msg = talloc_asprintf(talloc_tos(),
+ "cwd = \"%s\", filename = <NULL>",
+ cwd);
+ }
+ smb_time_audit_log_msg(syscallname, elapsed, msg);
+ TALLOC_FREE(msg);
+}
+
+static void smb_time_audit_log_smb_fname(const char *syscallname, double elapsed,
+ const struct smb_filename *smb_fname)
+{
+ if (smb_fname != NULL) {
+ smb_time_audit_log_fname(syscallname, elapsed,
+ smb_fname->base_name);
+ } else {
+ smb_time_audit_log_fname(syscallname, elapsed,
+ "smb_fname = <NULL>");
+ }
}
static int smb_time_audit_connect(vfs_handle_struct *handle,
clock_gettime_mono(&ts2);
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("connect", timediff);
+ smb_time_audit_log_msg("connect", timediff, user);
}
return result;
}
/* Don't have a reasonable notion of failure here */
if (timediff > audit_timeout) {
- smb_time_audit_log("disk_free", timediff);
+ smb_time_audit_log_fname("disk_free", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("get_shadow_copy_data", timediff);
+ smb_time_audit_log_fsp("get_shadow_copy_data", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("statvfs", timediff);
+ smb_time_audit_log_fname("statvfs", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("opendir", timediff);
+ smb_time_audit_log_fname("opendir", timediff, fname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fdopendir", timediff);
+ smb_time_audit_log_fsp("fdopendir", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("mkdir", timediff);
+ smb_time_audit_log_fname("mkdir", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("rmdir", timediff);
+ smb_time_audit_log_fname("rmdir", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("open", timediff);
+ smb_time_audit_log_fsp("open", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("create_file", timediff);
+ /*
+ * can't use result_fsp this time, may have
+ * invalid content causing smbd crash
+ */
+ smb_time_audit_log_smb_fname("create_file", timediff,
+ fname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("close", timediff);
+ smb_time_audit_log_fsp("close", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("read", timediff);
+ smb_time_audit_log_fsp("read", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("pread", timediff);
+ smb_time_audit_log_fsp("pread", timediff, fsp);
}
return result;
}
struct smb_time_audit_pread_state {
+ struct files_struct *fsp;
struct timespec ts1;
ssize_t ret;
int err;
return NULL;
}
clock_gettime_mono(&state->ts1);
+ state->fsp = fsp;
subreq = SMB_VFS_NEXT_PREAD_SEND(state, ev, handle, fsp, data,
n, offset);
timediff = nsec_time_diff(&ts2,&state->ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("pread", timediff);
+ smb_time_audit_log_fsp("pread", timediff, state->fsp);
}
if (tevent_req_is_unix_error(req, err)) {
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("write", timediff);
+ smb_time_audit_log_fsp("write", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("pwrite", timediff);
+ smb_time_audit_log_fsp("pwrite", timediff, fsp);
}
return result;
}
struct smb_time_audit_pwrite_state {
+ struct files_struct *fsp;
struct timespec ts1;
ssize_t ret;
int err;
return NULL;
}
clock_gettime_mono(&state->ts1);
+ state->fsp = fsp;
subreq = SMB_VFS_NEXT_PWRITE_SEND(state, ev, handle, fsp, data,
n, offset);
timediff = nsec_time_diff(&ts2,&state->ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("pwrite", timediff);
+ smb_time_audit_log_fsp("pwrite", timediff, state->fsp);
}
if (tevent_req_is_unix_error(req, err)) {
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("lseek", timediff);
+ smb_time_audit_log_fsp("lseek", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sendfile", timediff);
+ smb_time_audit_log_fsp("sendfile", timediff, fromfsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("recvfile", timediff);
+ smb_time_audit_log_fsp("recvfile", timediff, tofsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("rename", timediff);
+ smb_time_audit_log_smb_fname("rename", timediff, newname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fsync", timediff);
+ smb_time_audit_log_fsp("fsync", timediff, fsp);
}
return result;
}
struct smb_time_audit_fsync_state {
+ struct files_struct *fsp;
struct timespec ts1;
int ret;
int err;
return NULL;
}
clock_gettime_mono(&state->ts1);
+ state->fsp = fsp;
subreq = SMB_VFS_NEXT_FSYNC_SEND(state, ev, handle, fsp);
if (tevent_req_nomem(subreq, req)) {
timediff = nsec_time_diff(&ts2,&state->ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fsync", timediff);
+ smb_time_audit_log_fsp("fsync", timediff, state->fsp);
}
if (tevent_req_is_unix_error(req, err)) {
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("stat", timediff);
+ smb_time_audit_log_smb_fname("stat", timediff, fname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fstat", timediff);
+ smb_time_audit_log_fsp("fstat", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("lstat", timediff);
+ smb_time_audit_log_smb_fname("lstat", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("get_alloc_size", timediff);
+ smb_time_audit_log_fsp("get_alloc_size", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("unlink", timediff);
+ smb_time_audit_log_smb_fname("unlink", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("chmod", timediff);
+ smb_time_audit_log_fname("chmod", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fchmod", timediff);
+ smb_time_audit_log_fsp("fchmod", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("chown", timediff);
+ smb_time_audit_log_fname("chown", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fchown", timediff);
+ smb_time_audit_log_fsp("fchown", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("lchown", timediff);
+ smb_time_audit_log_fname("lchown", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("chdir", timediff);
+ smb_time_audit_log_fname("chdir", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("ntimes", timediff);
+ smb_time_audit_log_smb_fname("ntimes", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("ftruncate", timediff);
+ smb_time_audit_log_fsp("ftruncate", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fallocate", timediff);
+ smb_time_audit_log_fsp("fallocate", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("lock", timediff);
+ smb_time_audit_log_fsp("lock", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("kernel_flock", timediff);
+ smb_time_audit_log_fsp("kernel_flock", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("linux_setlease", timediff);
+ smb_time_audit_log_fsp("linux_setlease", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("getlock", timediff);
+ smb_time_audit_log_fsp("getlock", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("symlink", timediff);
+ smb_time_audit_log_fname("symlink", timediff, newpath);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("readlink", timediff);
+ smb_time_audit_log_fname("readlink", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("link", timediff);
+ smb_time_audit_log_fname("link", timediff, newpath);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("mknod", timediff);
+ smb_time_audit_log_fname("mknod", timediff, pathname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("realpath", timediff);
+ smb_time_audit_log_fname("realpath", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("notify_watch", timediff);
+ smb_time_audit_log_fname("notify_watch", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("chflags", timediff);
+ smb_time_audit_log_fname("chflags", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("streaminfo", timediff);
+ smb_time_audit_log_fsp("streaminfo", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("get_real_filename", timediff);
+ smb_time_audit_log_fname("get_real_filename", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("connectpath", timediff);
+ smb_time_audit_log_fname("connectpath", timediff, fname);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("brl_lock_windows", timediff);
+ smb_time_audit_log_fsp("brl_lock_windows", timediff,
+ br_lck->fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("brl_unlock_windows", timediff);
+ smb_time_audit_log_fsp("brl_unlock_windows", timediff,
+ br_lck->fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("brl_cancel_windows", timediff);
+ smb_time_audit_log_fsp("brl_cancel_windows", timediff,
+ br_lck->fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("strict_lock", timediff);
+ smb_time_audit_log_fsp("strict_lock", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("strict_unlock", timediff);
+ smb_time_audit_log_fsp("strict_unlock", timediff, fsp);
}
}
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("translate_name", timediff);
+ smb_time_audit_log_fname("translate_name", timediff, name);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fget_nt_acl", timediff);
+ smb_time_audit_log_fsp("fget_nt_acl", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("get_nt_acl", timediff);
+ smb_time_audit_log_fname("get_nt_acl", timediff, name);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fset_nt_acl", timediff);
+ smb_time_audit_log_fsp("fset_nt_acl", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("chmod_acl", timediff);
+ smb_time_audit_log_fname("chmod_acl", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fchmod_acl", timediff);
+ smb_time_audit_log_fsp("fchmod_acl", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sys_acl_get_file", timediff);
+ smb_time_audit_log_fname("sys_acl_get_file", timediff, path_p);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sys_acl_get_fd", timediff);
+ smb_time_audit_log_fsp("sys_acl_get_fd", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sys_acl_set_file", timediff);
+ smb_time_audit_log_fname("sys_acl_set_file", timediff, name);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sys_acl_set_fd", timediff);
+ smb_time_audit_log_fsp("sys_acl_set_fd", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("sys_acl_delete_def_file", timediff);
+ smb_time_audit_log_fname("sys_acl_delete_def_file", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("getxattr", timediff);
+ smb_time_audit_log_fname("getxattr", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fgetxattr", timediff);
+ smb_time_audit_log_fsp("fgetxattr", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("listxattr", timediff);
+ smb_time_audit_log_fname("listxattr", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("flistxattr", timediff);
+ smb_time_audit_log_fsp("flistxattr", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("removexattr", timediff);
+ smb_time_audit_log_fname("removexattr", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fremovexattr", timediff);
+ smb_time_audit_log_fsp("fremovexattr", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("setxattr", timediff);
+ smb_time_audit_log_fname("setxattr", timediff, path);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("fsetxattr", timediff);
+ smb_time_audit_log_fsp("fsetxattr", timediff, fsp);
}
return result;
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log("aio_force", timediff);
+ smb_time_audit_log_fsp("aio_force", timediff, fsp);
}
return result;