fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-10 03:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use SELINUX_CB_POLICYLOAD instead of AVC_CALLBACK_RESET callback

Browse source 
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://gitlab.freedesktop.org/dbus/dbus/issues/134
This commit is contained in:
Laurent Bigonville 2018-05-30 18:18:15 +02:00
parent 67f7bdf8c2
commit a442601cb2
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bus/selinux.c
View file

@ -135,14 +135,10 @@ 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;
_dbus_verbose ("SELinux policy reload callback called, sending SIGHUP\n");
return raise (SIGHUP);
}
/**
@ -327,15 +323,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);