From 3643aa9a63588b60797cb13e00a46e6c5dc845e8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 6 May 2008 13:53:45 +0200 Subject: Fix a panic in the [ug]id2sid valgrind bug fix Always, always run "make test" before pushing stuff :-) (This used to be commit 1444db8be1de00a3e9c805f1accd8f1f4670d729) --- source3/passdb/lookup_sid.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/passdb') diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index debd67b136..a7175b9647 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -1012,8 +1012,9 @@ static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid) return false; } - SMB_ASSERT(cache_value.length == sizeof(*psid)); - memcpy(psid, cache_value.data, sizeof(*psid)); + memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length)); + SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth)); + SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0)); return true; } @@ -1066,8 +1067,9 @@ static bool fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid) return false; } - SMB_ASSERT(cache_value.length == sizeof(*psid)); - memcpy(psid, cache_value.data, sizeof(*psid)); + memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length)); + SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth)); + SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0)); return true; } -- cgit