diff options
| author | Volker Lendecke <vl@samba.org> | 2018-08-06 14:33:34 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-08-23 10:39:31 +0200 |
| commit | 8ef80a001b961309d820a61404d41e23bef9ad1c (patch) | |
| tree | 6721e7cd8c88a05abde4eaa352104d706e0781a2 | |
| parent | a73d973f0869f2222b92723bf5acf86a9eaf4029 (diff) | |
| download | samba-8ef80a001b961309d820a61404d41e23bef9ad1c.tar.gz | |
vfs_fruit: Fix a leak of "br_lck"
Fix a panic if fruit_access_check detects a locking conflict.
do_lock() returns a valid br_lck even in case of a locking conflict.
Not free'ing it leads to a invalid lock order panic later, because
"br_lck" corresponds to a dbwrap lock on brlock.tdb.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13584
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 51d57073798f76ec4f1261945e0ba779b2530009)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 47034deaca5..684fcd664f6 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2372,7 +2372,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, uint32_t deny_mode) { NTSTATUS status = NT_STATUS_OK; - struct byte_range_lock *br_lck = NULL; bool open_for_reading, open_for_writing, deny_read, deny_write; off_t off; bool have_read = false; @@ -2430,6 +2429,8 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, /* Set locks */ if ((access_mask & FILE_READ_DATA) && have_read) { + struct byte_range_lock *br_lck = NULL; + off = access_to_netatalk_brl(fork_type, FILE_READ_DATA); br_lck = do_lock( handle->conn->sconn->msg_ctx, fsp, @@ -2437,13 +2438,16 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, READ_LOCK, POSIX_LOCK, false, &status, NULL); + TALLOC_FREE(br_lck); + if (!NT_STATUS_IS_OK(status)) { return status; } - TALLOC_FREE(br_lck); } if ((deny_mode & DENY_READ) && have_read) { + struct byte_range_lock *br_lck = NULL; + off = denymode_to_netatalk_brl(fork_type, DENY_READ); br_lck = do_lock( handle->conn->sconn->msg_ctx, fsp, @@ -2451,10 +2455,11 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, READ_LOCK, POSIX_LOCK, false, &status, NULL); + TALLOC_FREE(br_lck); + if (!NT_STATUS_IS_OK(status)) { return status; } - TALLOC_FREE(br_lck); } } @@ -2480,6 +2485,8 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, /* Set locks */ if ((access_mask & FILE_WRITE_DATA) && have_read) { + struct byte_range_lock *br_lck = NULL; + off = access_to_netatalk_brl(fork_type, FILE_WRITE_DATA); br_lck = do_lock( handle->conn->sconn->msg_ctx, fsp, @@ -2487,13 +2494,15 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, READ_LOCK, POSIX_LOCK, false, &status, NULL); + TALLOC_FREE(br_lck); + if (!NT_STATUS_IS_OK(status)) { return status; } - TALLOC_FREE(br_lck); - } if ((deny_mode & DENY_WRITE) && have_read) { + struct byte_range_lock *br_lck = NULL; + off = denymode_to_netatalk_brl(fork_type, DENY_WRITE); br_lck = do_lock( handle->conn->sconn->msg_ctx, fsp, @@ -2501,15 +2510,14 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, READ_LOCK, POSIX_LOCK, false, &status, NULL); + TALLOC_FREE(br_lck); + if (!NT_STATUS_IS_OK(status)) { return status; } - TALLOC_FREE(br_lck); } } - TALLOC_FREE(br_lck); - return status; } |