dpward / rpms / sssd

Forked from rpms/sssd 3 years ago
Clone

Blame SOURCES/0055-sudo-fix-error-handling-in-sudosrv_refresh_rules_don.patch

71e593
From 402f63b5a3b42797ec2b3e2ad53e50d198eb98b4 Mon Sep 17 00:00:00 2001
71e593
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
71e593
Date: Mon, 15 Oct 2018 13:01:34 +0200
71e593
Subject: [PATCH 55/57] sudo: fix error handling in sudosrv_refresh_rules_done
71e593
71e593
If sbus returns non-zero code then the output variables are not set and
71e593
therefore we access uninitialized memory.
71e593
71e593
Resolves:
71e593
https://pagure.io/SSSD/sssd/issue/3854
71e593
71e593
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
71e593
(cherry picked from commit 8fbaf224193b9ca8b82a290bd52265c2f9b40315)
71e593
---
71e593
 src/responder/sudo/sudosrv_get_sudorules.c | 7 ++++++-
71e593
 1 file changed, 6 insertions(+), 1 deletion(-)
71e593
71e593
diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
71e593
index 14bd824775fea47fd28ca4880d31cfc67b03d0da..76faef0f566235324999a9a85246dd960119cab3 100644
71e593
--- a/src/responder/sudo/sudosrv_get_sudorules.c
71e593
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
71e593
@@ -576,10 +576,15 @@ static void sudosrv_refresh_rules_done(struct tevent_req *subreq)
71e593
     ret = sss_dp_get_sudoers_recv(state, subreq, &err_maj, &err_min, &err_msg);
71e593
     talloc_zfree(subreq);
71e593
     if (ret != EOK) {
71e593
+        DEBUG(SSSDBG_CRIT_FAILURE, "Unable to refresh rules [%d]: %s\n",
71e593
+              ret, sss_strerror(ret));
71e593
+        goto done;
71e593
+    } else if (err_maj != 0 || err_min != 0) {
71e593
         DEBUG(SSSDBG_CRIT_FAILURE,
71e593
               "Unable to get information from Data Provider, "
71e593
               "Error: %u, %u, %s\n",
71e593
-              (unsigned int)err_maj, (unsigned int)err_min, err_msg);
71e593
+              (unsigned int)err_maj, (unsigned int)err_min,
71e593
+              (err_msg == NULL ? "(null)" : err_msg));
71e593
         goto done;
71e593
     }
71e593
 
71e593
-- 
71e593
2.14.4
71e593