Attachment 16496 Details for Bug 14636 – New patch

[patch] New patch

patch.txt (text/plain), 1.97 KB, created by Volker Lendecke on 2021-03-03 18:40:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2021-03-03 18:40:30 UTC

Size: 1.97 KB

patch

obsolete

>From 8b97b37e310a0dff9351dc53ed5dbc6d43268817 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 3 Mar 2021 19:19:23 +0100
>Subject: [PATCH 1/2] locking: Fix an uninitialized variable read
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=14636
>Signed-off-by: Volker Lendecke <vl@samba.org>
>---
> source3/locking/share_mode_lock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
>index e8bb3e58e1f..d8c5222d70a 100644
>--- a/source3/locking/share_mode_lock.c
>+++ b/source3/locking/share_mode_lock.c
>@@ -2167,7 +2167,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 had_share_entries, have_share_entries;
>-- 
>2.20.1
>
>
>From f131da8e0a2829d4d8ad84f43c333d9364c29436 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 3 Mar 2021 19:15:31 +0100
>Subject: [PATCH 2/2] 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@samba.org>
>---
> source3/lib/g_lock.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>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);
>-- 
>2.20.1
>

Flags:

slow: review+

Actions: View

Attachments on bug 14636: 16489 | 16490 | 16491 | 16492 | 16495 | 16496 | 16497 | 16498 | 16502 | 16503 | 16504