Attachment 16127 Details for Bug 14435 – Patch for 4.13

[patch] Patch for 4.13

bz-14435-4.13.txt (text/plain), 4.81 KB, created by Volker Lendecke on 2020-07-10 10:11:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2020-07-10 10:11:42 UTC

Size: 4.81 KB

patch

obsolete

>From 403b9e8d6671a9c293d7281742d0032c1ec1c415 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 8 Jul 2020 15:00:49 +0200
>Subject: [PATCH 1/2] winbind: Add test for lookuprids cache problem
>
>When reading entries from gencache, wb_cache_rids_to_names() can
>return STATUS_SOME_UNMAPPED, which _wbint_LookupRids() does not handle
>correctly.
>
>This test enforces this situation by filling gencache with one wbinfo
>-R and then erasing the winbindd_cache.tdb. This forces winbind to
>enter the domain helper process, which will then read from gencache
>filled with the previous wbinfo -R.
>
>Without having the entries cached this does not happen because
>wb_cache_rids_to_names() via the do_query: path calls deep inside
>calls dcerpc_lsa_lookup_sids_noalloc(), which hides the
>STATUS_SOME_UNMAPPED that came in as lsa_LookupSids result value.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=14435
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>(cherry picked from commit 04eafce653afcff517317d2b190acc4f0cbf4c61)
>---
> selftest/knownfail.d/lookuprids_cache         |  1 +
> .../tests/test_wbinfo_lookuprids_cache.sh     | 21 +++++++++++++++++++
> source3/selftest/tests.py                     |  5 +++++
> 3 files changed, 27 insertions(+)
> create mode 100644 selftest/knownfail.d/lookuprids_cache
> create mode 100755 source3/script/tests/test_wbinfo_lookuprids_cache.sh
>
>diff --git a/selftest/knownfail.d/lookuprids_cache b/selftest/knownfail.d/lookuprids_cache
>new file mode 100644
>index 00000000000..d3c40a62b45
>--- /dev/null
>+++ b/selftest/knownfail.d/lookuprids_cache
>@@ -0,0 +1 @@
>+^samba.wbinfo_lookuprids_cache.lookuprids2$nt4_member:local$
>\ No newline at end of file
>diff --git a/source3/script/tests/test_wbinfo_lookuprids_cache.sh b/source3/script/tests/test_wbinfo_lookuprids_cache.sh
>new file mode 100755
>index 00000000000..0b21ffcd7c9
>--- /dev/null
>+++ b/source3/script/tests/test_wbinfo_lookuprids_cache.sh
>@@ -0,0 +1,21 @@
>+#!/bin/sh
>+
>+WBINFO="$VALGRIND ${WBINFO:-$BINDIR/wbinfo}"
>+TDBTOOL="${TDBTOOL:-$BINDIR/tdbtool}"
>+TDBDUMP="${TDBDUMP:-$BINDIR/tdbdump}"
>+NET="$VALGRIND ${NET:-$BINDIR/net}"
>+
>+cache="$LOCK_DIR"/winbindd_cache.tdb
>+
>+incdir=`dirname $0`/../../../testprogs/blackbox
>+. $incdir/subunit.sh
>+
>+testit "flush" "$NET" "cache" "flush" || failed=`expr $failed + 1`
>+testit "lookuprids1" "$WBINFO" "-R" "512,12345" || failed=`expr $failed + 1`
>+
>+key=$("$TDBDUMP" "$cache" | grep ^key.*NDR.*/16/ | cut -d\" -f2)
>+
>+testit "delete" "$TDBTOOL" "$cache" delete "$key"
>+testit "lookuprids2" "$WBINFO" "-R" "512,12345" || failed=`expr $failed + 1`
>+
>+testok $0 $failed
>diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
>index cfdfaa98c84..e2aebdcb6e2 100755
>--- a/source3/selftest/tests.py
>+++ b/source3/selftest/tests.py
>@@ -365,6 +365,11 @@ env = "nt4_member:local"
> plantestsuite("samba3.wbinfo_sids_to_xids", env,
>               [os.path.join(srcdir(),
>                             "nsswitch/tests/test_wbinfo_sids_to_xids.sh")])
>+plantestsuite(
>+    "samba.wbinfo_lookuprids_cache",
>+    env,
>+    [os.path.join(samba3srcdir,
>+                  "script/tests/test_wbinfo_lookuprids_cache.sh")])
> 
> env = "ad_member"
> t = "WBCLIENT-MULTI-PING"
>-- 
>2.20.1
>
>
>From 45079b073c75f95818639324ebea333e3a4bd1ea Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 8 Jul 2020 15:09:45 +0200
>Subject: [PATCH 2/2] winbind: Fix lookuprids cache problem
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=14435
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Thu Jul  9 21:40:52 UTC 2020 on sn-devel-184
>
>(cherry picked from commit cd4122d91e942ca465c03505d5e148117f505ba4)
>---
> selftest/knownfail.d/lookuprids_cache | 1 -
> source3/winbindd/winbindd_dual_srv.c  | 3 ++-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> delete mode 100644 selftest/knownfail.d/lookuprids_cache
>
>diff --git a/selftest/knownfail.d/lookuprids_cache b/selftest/knownfail.d/lookuprids_cache
>deleted file mode 100644
>index d3c40a62b45..00000000000
>--- a/selftest/knownfail.d/lookuprids_cache
>+++ /dev/null
>@@ -1 +0,0 @@
>-^samba.wbinfo_lookuprids_cache.lookuprids2$nt4_member:local$
>\ No newline at end of file
>diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
>index 6071bee6d65..b8694db3db9 100644
>--- a/source3/winbindd/winbindd_dual_srv.c
>+++ b/source3/winbindd/winbindd_dual_srv.c
>@@ -673,7 +673,8 @@ NTSTATUS _wbint_LookupRids(struct pipes_struct *p, struct wbint_LookupRids *r)
> 					r->in.rids->rids, r->in.rids->num_rids,
> 					&domain_name, &names, &types);
> 	reset_cm_connection_on_error(domain, NULL, status);
>-	if (!NT_STATUS_IS_OK(status)) {
>+	if (!NT_STATUS_IS_OK(status) &&
>+	    !NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
> 		return status;
> 	}
> 
>-- 
>2.20.1
>

Flags:

slow: review+
vl: ci-passed+

Actions: View

Attachments on bug 14435: 16125 | 16126 | 16127