Attachment 139866 Details for Bug 92831 – Use SELINUX_CB_POLICYLOAD instead of AVC_CALLBACK_RESET callback

[patch] Use SELINUX_CB_POLICYLOAD instead of AVC_CALLBACK_RESET callback

Use-SELINUXCBPOLICYLOAD-instead-of-AVCCALLBACKRESE.patch (text/plain), 1.86 KB, created by Laurent Bigonville on 2018-05-30 16:24:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent Bigonville

Created: 2018-05-30 16:24:25 UTC

Size: 1.86 KB

patch

obsolete

>From 6992abc6b9fdd803b3f15b30c55aae96145977c0 Mon Sep 17 00:00:00 2001
>From: Laurent Bigonville <bigon@bigon.be>
>Date: Wed, 30 May 2018 18:18:15 +0200
>Subject: [PATCH] Use SELINUX_CB_POLICYLOAD instead of AVC_CALLBACK_RESET
> callback
>
>Use SELINUX_CB_POLICYLOAD instead of AVC_CALLBACK_RESET callback as this
>only seems necessary on policy reload and not if the enforcing mode is
>changing.
>
>See discussion at https://marc.info/?l=selinux&m=152173501930182&w=2
>
>https://bugs.freedesktop.org/show_bug.cgi?id=92831
>---
> bus/selinux.c | 19 +++----------------
> 1 file changed, 3 insertions(+), 16 deletions(-)
>
>diff --git a/bus/selinux.c b/bus/selinux.c
>index 5aef0902..ef737c29 100644
>--- a/bus/selinux.c
>+++ b/bus/selinux.c
>@@ -135,14 +135,9 @@ out:
>  * this could have changed.  Send a SIGHUP to reload all configs.
>  */
> static int
>-policy_reload_callback (u_int32_t event, security_id_t ssid, 
>-                        security_id_t tsid, security_class_t tclass, 
>-                        access_vector_t perms, access_vector_t *out_retained)
>+policy_reload_callback (int seqno)
> {
>-  if (event == AVC_CALLBACK_RESET)
>-    return raise (SIGHUP);
>-  
>-  return 0;
>+  return raise (SIGHUP);
> }
> 
> /**
>@@ -326,15 +321,7 @@ bus_selinux_full_init (BusContext *context, DBusError *error)
>       goto error;
>     }
> 
>-  if (avc_add_callback (policy_reload_callback, AVC_CALLBACK_RESET,
>-                       NULL, NULL, 0, 0) < 0)
>-    {
>-      dbus_set_error (error, DBUS_ERROR_FAILED,
>-                      "Failed to add policy reload callback: %s",
>-                      _dbus_strerror (errno));
>-      goto error;
>-    }
>-
>+  selinux_set_callback (SELINUX_CB_POLICYLOAD, (union selinux_callback) policy_reload_callback);
>   selinux_set_callback (SELINUX_CB_AUDIT, (union selinux_callback) log_audit_callback);
>   selinux_set_callback (SELINUX_CB_LOG, (union selinux_callback) log_callback);
> 
>-- 
>2.17.1

Actions: View | Splinter Review

Attachments on bug 92831: 137773 | 137794 | 137801 | 137802 | 137803 | 138031 | 139865 | 139866

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.