daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 3a82f8be03b07b84fa470c6e42cd87865aeaf701 Mon Sep 17 00:00:00 2001
923a60
From: Will Woods <wwoods@redhat.com>
923a60
Date: Fri, 13 Mar 2015 17:24:46 -0400
923a60
Subject: [PATCH] selinux: fix SEGV during switch-root if SELinux policy loaded
923a60
923a60
If you've got SELinux policy loaded, label_hnd is your labeling handle.
923a60
When systemd is shutting down, we free that handle via mac_selinux_finish().
923a60
923a60
But: switch_root() calls mkdir_p_label(), which tries to look up a label
923a60
using that freed handle, and so we get a bunch of garbage and eventually
923a60
SEGV in libselinux.
923a60
923a60
(This doesn't happen in the switch-root from initramfs to real root because
923a60
there's no SELinux policy loaded in initramfs, so label_hnd is NULL and we
923a60
never attempt any lookups.)
923a60
923a60
So: make sure that mac_selinux_finish() actually sets label_hnd to NULL, so
923a60
nobody tries to use it after it becomes invalid.
923a60
923a60
https://bugzilla.redhat.com/show_bug.cgi?id=1185604
923a60
(cherry picked from commit f5ce2b49585a14cefb6d02f61c8dcdf7628a8605)
923a60
---
923a60
 src/shared/selinux-util.c | 1 +
923a60
 1 file changed, 1 insertion(+)
923a60
923a60
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
923a60
index a2233e0cfb..a46ddf8498 100644
923a60
--- a/src/shared/selinux-util.c
923a60
+++ b/src/shared/selinux-util.c
923a60
@@ -117,6 +117,7 @@ void mac_selinux_finish(void) {
923a60
                 return;
923a60
 
923a60
         selabel_close(label_hnd);
923a60
+        label_hnd = NULL;
923a60
 #endif
923a60
 }
923a60