sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s3:locking: let _share_mode_do_locked_vfs_* use get/put_share_mode_lock_internal

Browse Source 
This avoids calling talloc(mem_ctx, struct share_mode_lock)
and uses stack variables instead.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-08-26 13:06:40 +02:00 committed by Jeremy Allison
parent a2f6f96ac7
commit d7f4294692
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source3/locking/share_mode_lock.c
View File

@ -2713,21 +2713,32 @@ NTSTATUS _share_mode_do_locked_vfs_denied(
const char *location) const char *location)
{ {
struct smb_vfs_deny_state vfs_deny = {}; struct smb_vfs_deny_state vfs_deny = {};
struct share_mode_lock *lck = NULL; struct share_mode_lock lck;
NTSTATUS status;
lck = get_existing_share_mode_lock(talloc_tos(), id); status = get_share_mode_lock_internal(id,
if (lck == NULL) { NULL, /* servicepath */
NTSTATUS status = NT_STATUS_NOT_FOUND; NULL, /* smb_fname */
DBG_DEBUG("get_existing_share_mode_lock failed: %s\n", NULL, /* old_write_time */
nt_errstr(status)); &lck);
if (!NT_STATUS_IS_OK(status)) {
DBG_GET_SHARE_MODE_LOCK(status,
"get_share_mode_lock_internal failed: %s\n",
nt_errstr(status));
return status; return status;
} }
_smb_vfs_deny_push(&vfs_deny, location); _smb_vfs_deny_push(&vfs_deny, location);
fn(lck, private_data); fn(&lck, private_data);
_smb_vfs_deny_pop(&vfs_deny, location); _smb_vfs_deny_pop(&vfs_deny, location);
TALLOC_FREE(lck); status = put_share_mode_lock_internal(&lck);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("put_share_mode_lock_internal failed: %s\n",
nt_errstr(status));
smb_panic("put_share_mode_lock_internal failed\n");
return status;
}
return NT_STATUS_OK; return NT_STATUS_OK;
} }
@ -2751,21 +2762,32 @@ NTSTATUS _share_mode_do_locked_vfs_allowed(
void *private_data, void *private_data,
const char *location) const char *location)
{ {
struct share_mode_lock *lck = NULL; struct share_mode_lock lck;
NTSTATUS status;
smb_vfs_assert_allowed(); smb_vfs_assert_allowed();
lck = get_existing_share_mode_lock(talloc_tos(), id); status = get_share_mode_lock_internal(id,
if (lck == NULL) { NULL, /* servicepath */
NTSTATUS status = NT_STATUS_NOT_FOUND; NULL, /* smb_fname */
DBG_DEBUG("get_existing_share_mode_lock failed: %s\n", NULL, /* old_write_time */
nt_errstr(status)); &lck);
if (!NT_STATUS_IS_OK(status)) {
DBG_GET_SHARE_MODE_LOCK(status,
"get_share_mode_lock_internal failed: %s\n",
nt_errstr(status));
return status; return status;
} }
fn(lck, private_data); fn(&lck, private_data);
TALLOC_FREE(lck); status = put_share_mode_lock_internal(&lck);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("put_share_mode_lock_internal failed: %s\n",
nt_errstr(status));
smb_panic("put_share_mode_lock_internal failed\n");
return status;
}
return NT_STATUS_OK; return NT_STATUS_OK;
} }