|
 |
bf7bd7 |
From ff24d1538af88f83d0a3cc2817952cf70e7ca580 Mon Sep 17 00:00:00 2001
|
|
|
bf7bd7 |
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
bf7bd7 |
Date: Sun, 22 Nov 2020 17:44:07 +0100
|
|
|
bf7bd7 |
Subject: [PATCH] SYSDB: merge_res_sysdb_attrs() fixed to avoid NULL ptr in
|
|
|
bf7bd7 |
msgs[]
|
|
|
bf7bd7 |
MIME-Version: 1.0
|
|
|
bf7bd7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bf7bd7 |
Content-Transfer-Encoding: 8bit
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
This helps to avoid sssd_be segfaults at be_refresh_get_values_ex() due to NULL
|
|
|
bf7bd7 |
ptrs in results of sysdb_search_with_ts_attr()
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
Resolves: https://github.com/SSSD/sssd/issues/5412
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
bf7bd7 |
---
|
|
|
bf7bd7 |
src/db/sysdb_search.c | 11 +++++++----
|
|
|
bf7bd7 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c
|
|
|
bf7bd7 |
index e616fd5bc..4ff65c1ae 100644
|
|
|
bf7bd7 |
--- a/src/db/sysdb_search.c
|
|
|
bf7bd7 |
+++ b/src/db/sysdb_search.c
|
|
|
bf7bd7 |
@@ -221,6 +221,7 @@ static errno_t merge_res_sysdb_attrs(TALLOC_CTX *mem_ctx,
|
|
|
bf7bd7 |
const char *attrs[])
|
|
|
bf7bd7 |
{
|
|
|
bf7bd7 |
errno_t ret;
|
|
|
bf7bd7 |
+ size_t ts_cache_res_count = 0;
|
|
|
bf7bd7 |
struct ldb_result *ts_cache_res = NULL;
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
if (ts_res == NULL || ctx->ldb_ts == NULL) {
|
|
|
bf7bd7 |
@@ -231,7 +232,6 @@ static errno_t merge_res_sysdb_attrs(TALLOC_CTX *mem_ctx,
|
|
|
bf7bd7 |
if (ts_cache_res == NULL) {
|
|
|
bf7bd7 |
return ENOMEM;
|
|
|
bf7bd7 |
}
|
|
|
bf7bd7 |
- ts_cache_res->count = ts_res->count;
|
|
|
bf7bd7 |
ts_cache_res->msgs = talloc_zero_array(ts_cache_res,
|
|
|
bf7bd7 |
struct ldb_message *,
|
|
|
bf7bd7 |
ts_res->count);
|
|
|
bf7bd7 |
@@ -244,15 +244,18 @@ static errno_t merge_res_sysdb_attrs(TALLOC_CTX *mem_ctx,
|
|
|
bf7bd7 |
ret = merge_msg_sysdb_attrs(ts_cache_res->msgs,
|
|
|
bf7bd7 |
ctx,
|
|
|
bf7bd7 |
ts_res->msgs[c],
|
|
|
bf7bd7 |
- &ts_cache_res->msgs[c], attrs);
|
|
|
bf7bd7 |
- if (ret != EOK) {
|
|
|
bf7bd7 |
+ &ts_cache_res->msgs[ts_cache_res_count],
|
|
|
bf7bd7 |
+ attrs);
|
|
|
bf7bd7 |
+ if ((ret != EOK) || (ts_cache_res->msgs[ts_cache_res_count] == NULL)) {
|
|
|
bf7bd7 |
DEBUG(SSSDBG_MINOR_FAILURE,
|
|
|
bf7bd7 |
"Cannot merge sysdb cache values for %s\n",
|
|
|
bf7bd7 |
ldb_dn_get_linearized(ts_res->msgs[c]->dn));
|
|
|
bf7bd7 |
- /* non-fatal, we just get only the non-timestamp attrs */
|
|
|
bf7bd7 |
+ /* non-fatal, just skip */
|
|
|
bf7bd7 |
continue;
|
|
|
bf7bd7 |
}
|
|
|
bf7bd7 |
+ ts_cache_res_count += 1;
|
|
|
bf7bd7 |
}
|
|
|
bf7bd7 |
+ ts_cache_res->count = ts_cache_res_count;
|
|
|
bf7bd7 |
|
|
|
bf7bd7 |
*_ts_cache_res = ts_cache_res;
|
|
|
bf7bd7 |
return EOK;
|
|
|
bf7bd7 |
--
|
|
|
bf7bd7 |
2.21.3
|
|
|
bf7bd7 |
|