[SCM] Samba Shared Repository - branch v4-12-test updated

[Karolin Seeger]

The branch, v4-12-test has been updated
       via  5dd17586cd6 g_lock: Fix uninitalized variable reads
       via  df832cb62c0 locking: Fix an uninitialized variable read
      from  88ee4160e88 s3:modules:vfs_virusfilter: Recent talloc changes cause infinite start-up failure

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test


- Log -----------------------------------------------------------------
commit 5dd17586cd600518c3187b4af2d4cc6167d52eb7
Author: Volker Lendecke <vl at 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 <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at 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-12-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-12-test): Mon Mar  8 08:51:39 UTC 2021 on sn-devel-184

commit df832cb62c01bf6a2a801340a4434c0db51c34e0
Author: Volker Lendecke <vl at 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 <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at 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 4bf30188a43..c3b4b644537 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -600,8 +600,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 a736bc24469..a0de9f5b070 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -1923,7 +1923,7 @@ static void share_mode_entry_do_fn(
 	struct share_mode_entry_do_state *state = private_data;
 	size_t idx;
 	bool found = false;
-	bool modified;
+	bool modified = false;
 	struct share_mode_entry e;
 	struct share_mode_entry_buf buf;
 	TDB_DATA dbufs[3];


-- 
Samba Shared Repository