The branch, v4-13-test has been updated via 6c5e6046345 g_lock: Fix uninitalized variable reads via efd3ee23123 locking: Fix an uninitialized variable read from a04f19ecdd3 s3:modules:vfs_virusfilter: Recent talloc changes cause infinite start-up failure
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-13-test - Log ----------------------------------------------------------------- commit 6c5e6046345914d8e0660d9d279d8abc3921535a Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 3 19:15:31 2021 +0100 g_lock: Fix uninitalized variable reads If dbwrap_watched_watch_recv() returns IO_TIMEOUT, "blockerdead" might be an uninitialized non-false, and further down we'll remove the wrong exclusive locker. Bug: https://bugzilla.samba.org/show_bug.cgi?id=14636 Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Fri Mar 5 11:22:07 UTC 2021 on sn-devel-184 (cherry picked from commit 654c18a244f060d81280493a324b98602a69dbbf) Autobuild-User(v4-13-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-13-test): Mon Mar 8 09:47:35 UTC 2021 on sn-devel-184 commit efd3ee23123c2cc7685113f4253b800258b7532f Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 3 19:19:23 2021 +0100 locking: Fix an uninitialized variable read Bug: https://bugzilla.samba.org/show_bug.cgi?id=14636 Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> (cherry picked from commit 84b634c613352fc1da8e1525d72597c526d534d2) ----------------------------------------------------------------------- Summary of changes: source3/lib/g_lock.c | 4 ++-- source3/locking/share_mode_lock.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index c36539393e1..36b527706da 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -646,8 +646,8 @@ static void g_lock_lock_retry(struct tevent_req *subreq) struct g_lock_lock_state *state = tevent_req_data( req, struct g_lock_lock_state); struct g_lock_lock_fn_state fn_state; - struct server_id blocker; - bool blockerdead; + struct server_id blocker = { .pid = 0 }; + bool blockerdead = false; NTSTATUS status; status = dbwrap_watched_watch_recv(subreq, &blockerdead, &blocker); diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 1c4d3a42221..d4c27e4d654 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -2256,7 +2256,7 @@ static bool share_mode_entry_do( struct locking_tdb_data *ltdb = NULL; size_t idx; bool found = false; - bool modified; + bool modified = false; struct share_mode_entry e; uint8_t *e_ptr = NULL; bool have_share_modes; -- Samba Shared Repository