URL: https://github.com/SSSD/sssd/pull/165 Author: mzidek-rh Title: #165: selinux: Do not fail if SELinux is not managed Action: opened
PR body: """ Previously we failed if selinux_is_managed returned 0 or -1 (not managed or error). With this patch we only fail in case of error and continue normally if selinux is not managed by libsemanage at all. Resolves: https://fedorahosted.org/sssd/ticket/3297 """ To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/165/head:pr165 git checkout pr165
From 013b86dbdb0a98a382a1b726732f7b20076aabea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzi...@redhat.com> Date: Wed, 8 Feb 2017 12:01:37 +0100 Subject: [PATCH] selinux: Do not fail if SELinux is not managed Previously we failed if selinux_is_managed returned 0 or -1 (not managed or error). With this patch we only fail in case of error and continue normally if selinux is not managed by libsemanage at all. Resolves: https://fedorahosted.org/sssd/ticket/3297 --- src/providers/ipa/selinux_child.c | 4 +++ src/util/sss_semanage.c | 63 +++++++++++++++++++++++++-------------- src/util/util_errors.c | 1 + src/util/util_errors.h | 1 + 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/providers/ipa/selinux_child.c b/src/providers/ipa/selinux_child.c index 380005c..09a167f 100644 --- a/src/providers/ipa/selinux_child.c +++ b/src/providers/ipa/selinux_child.c @@ -182,6 +182,10 @@ static bool seuser_needs_update(struct input_buffer *ibuf) strcmp(db_mls_range, ibuf->mls_range) == 0) { needs_update = false; } + /* OR */ + if (ret == ERR_SELINUX_NOT_MANAGED) { + needs_update = false; + } talloc_free(db_seuser); talloc_free(db_mls_range); diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c index fe06bee..9f58fb9 100644 --- a/src/util/sss_semanage.c +++ b/src/util/sss_semanage.c @@ -73,7 +73,7 @@ static void sss_semanage_close(semanage_handle_t *handle) semanage_handle_destroy(handle); } -static semanage_handle_t *sss_semanage_init(void) +int sss_semanage_init(semanage_handle_t **_handle) { int ret; semanage_handle_t *handle = NULL; @@ -81,7 +81,8 @@ static semanage_handle_t *sss_semanage_init(void) handle = semanage_handle_create(); if (!handle) { DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux management handle\n"); - return NULL; + ret = EIO; + goto done; } semanage_msg_set_callback(handle, @@ -89,28 +90,41 @@ static semanage_handle_t *sss_semanage_init(void) NULL); ret = semanage_is_managed(handle); - if (ret != 1) { - DEBUG(SSSDBG_CRIT_FAILURE, "SELinux policy not managed\n"); - goto fail; + if (ret == 0) { + DEBUG(SSSDBG_TRACE_FUNC, "SELinux policy not managed\n"); + ret = ERR_SELINUX_NOT_MANAGED; + goto done; + } else if ( ret == -1) { + DEBUG(SSSDBG_CRIT_FAILURE, "Call to semanage_is_managed failed\n"); + ret = EIO; + goto done; } ret = semanage_access_check(handle); if (ret < SEMANAGE_CAN_READ) { DEBUG(SSSDBG_CRIT_FAILURE, "Cannot read SELinux policy store\n"); - goto fail; + ret = EACCES; + goto done; } ret = semanage_connect(handle); if (ret != 0) { DEBUG(SSSDBG_CRIT_FAILURE, "Cannot estabilish SELinux management connection\n"); - goto fail; + ret = EIO; + goto done; } - return handle; -fail: - sss_semanage_close(handle); - return NULL; + ret = EOK; + +done: + if (ret != EOK) { + sss_semanage_close(handle); + } else { + *_handle = handle; + } + + return ret; } static int sss_semanage_user_add(semanage_handle_t *handle, @@ -228,10 +242,11 @@ int set_seuser(const char *login_name, const char *seuser_name, return EOK; } - handle = sss_semanage_init(); - if (!handle) { - DEBUG(SSSDBG_CRIT_FAILURE, "Cannot init SELinux management\n"); - ret = EIO; + ret = sss_semanage_init(&handle); + if (ret != EOK) { + if (ret != ERR_SELINUX_NOT_MANAGED) { + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux handle\n"); + } goto done; } @@ -295,10 +310,11 @@ int del_seuser(const char *login_name) int ret; int exists = 0; - handle = sss_semanage_init(); - if (!handle) { - DEBUG(SSSDBG_CRIT_FAILURE, "Cannot init SELinux management\n"); - ret = EIO; + ret = sss_semanage_init(&handle); + if (ret != EOK) { + if (ret != ERR_SELINUX_NOT_MANAGED) { + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux handle\n"); + } goto done; } @@ -377,10 +393,11 @@ int get_seuser(TALLOC_CTX *mem_ctx, const char *login_name, semanage_seuser_t *sm_user = NULL; semanage_seuser_key_t *sm_key = NULL; - sm_handle = sss_semanage_init(); - if (sm_handle == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux handle\n"); - ret = EIO; + ret = sss_semanage_init(&sm_handle); + if (ret != EOK) { + if (ret != ERR_SELINUX_NOT_MANAGED) { + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux handle\n"); + } goto done; } diff --git a/src/util/util_errors.c b/src/util/util_errors.c index 88ebf4e..4fde683 100644 --- a/src/util/util_errors.c +++ b/src/util/util_errors.c @@ -74,6 +74,7 @@ struct err_string error_to_str[] = { { "Cannot connect to system bus" }, /* ERR_NO_SYSBUS */ { "LDAP search returned a referral" }, /* ERR_REFERRAL */ { "Error setting SELinux user context" }, /* ERR_SELINUX_CONTEXT */ + { "SELinux is not managed by libsemanage" }, /* ERR_SELINUX_NOT_MANAGED */ { "Username format not allowed by re_expression" }, /* ERR_REGEX_NOMATCH */ { "Time specification not supported" }, /* ERR_TIMESPEC_NOT_SUPPORTED */ { "Invalid SSSD configuration detected" }, /* ERR_INVALID_CONFIG */ diff --git a/src/util/util_errors.h b/src/util/util_errors.h index 525983f..f68921d 100644 --- a/src/util/util_errors.h +++ b/src/util/util_errors.h @@ -96,6 +96,7 @@ enum sssd_errors { ERR_NO_SYSBUS, ERR_REFERRAL, ERR_SELINUX_CONTEXT, + ERR_SELINUX_NOT_MANAGED, ERR_REGEX_NOMATCH, ERR_TIMESPEC_NOT_SUPPORTED, ERR_INVALID_CONFIG,
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
