From 4f1ae61da9eda1115c1461e77a44101d96532700 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Wed, 2 Mar 2016 10:16:39 -0500

Subject: [PATCH] selinux: use raw variants of security_compute_create and

 setfscreatecon

As suggested by Evgeny Vereshchagin as a follow up for

https://github.com/systemd/systemd/pull/2781#issuecomment-191043402.

(cherry picked from commit 5c5433ad32c3d911f0c66cc124d190d40a2b5f5b)

---

 src/basic/selinux-util.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c

index 71ceac1bcd..5e6181f662 100644

--- a/src/basic/selinux-util.c

+++ b/src/basic/selinux-util.c

@@ -217,7 +217,7 @@ int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {

                 return -errno;

         sclass = string_to_security_class("process");

-        r = security_compute_create(mycon, fcon, sclass, (security_context_t *) label);

+        r = security_compute_create_raw(mycon, fcon, sclass, (security_context_t *) label);

         if (r < 0)

                 return -errno;

 #endif

@@ -296,7 +296,7 @@ int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, const char *

                 return -ENOMEM;

         sclass = string_to_security_class("process");

-        r = security_compute_create(mycon, fcon, sclass, (security_context_t *) label);

+        r = security_compute_create_raw(mycon, fcon, sclass, (security_context_t *) label);

         if (r < 0)

                 return -errno;

 #endif

@@ -350,7 +350,7 @@ int mac_selinux_create_file_prepare(const char *path, mode_t mode) {

                 log_enforcing("Failed to determine SELinux security context for %s: %m", path);

         } else {

-                if (setfscreatecon(filecon) >= 0)

+                if (setfscreatecon_raw(filecon) >= 0)

                         return 0; /* Success! */

                 log_enforcing("Failed to set SELinux security context %s for %s: %m", filecon, path);