selinux: make use of cleanup gcc magic

[elogind.git] / src / shared / selinux-util.c

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index a277dad35752e5f22c1035ef5edd5307cf86ad86..b1fdfab434f51ad4cab6277037e3d50720de81f0 100644 (file)
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -40,24 +40,24 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
 #define _cleanup_security_context_free_ _cleanup_(freeconp)
 #define _cleanup_context_free_ _cleanup_(context_freep)
 
-static int use_selinux_cached = -1;
+static int cached_use = -1;
 static struct selabel_handle *label_hnd = NULL;
 #endif
 
-bool use_selinux(void) {
+bool mac_selinux_use(void) {
 #ifdef HAVE_SELINUX
-        if (use_selinux_cached < 0)
-                use_selinux_cached = is_selinux_enabled() > 0;
+        if (cached_use < 0)
+                cached_use = is_selinux_enabled() > 0;
 
-        return use_selinux_cached;
+        return cached_use;
 #else
         return false;
 #endif
 }
 
-void retest_selinux(void) {
+void mac_selinux_retest(void) {
 #ifdef HAVE_SELINUX
-        use_selinux_cached = -1;
+        cached_use = -1;
 #endif
 }
 
@@ -68,7 +68,7 @@ int mac_selinux_init(const char *prefix) {
         usec_t before_timestamp, after_timestamp;
         struct mallinfo before_mallinfo, after_mallinfo;
 
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return 0;
 
         if (label_hnd)
@@ -156,7 +156,7 @@ int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
 void mac_selinux_finish(void) {
 
 #ifdef HAVE_SELINUX
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return;
 
         if (label_hnd)
@@ -169,10 +169,10 @@ int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
-        security_context_t mycon = NULL, fcon = NULL;
+        _cleanup_security_context_free_ security_context_t mycon = NULL, fcon = NULL;
         security_class_t sclass;
 
-        if (!use_selinux()) {
+        if (!mac_selinux_use()) {
                 *label = NULL;
                 return 0;
         }
@@ -193,9 +193,6 @@ int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {
 fail:
         if (r < 0 && security_getenforce() == 1)
                 r = -errno;
-
-        freecon(mycon);
-        freecon(fcon);
 #endif
 
         return r;
@@ -313,9 +310,9 @@ int mac_selinux_context_set(const char *path, mode_t mode) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
-        security_context_t filecon = NULL;
+        _cleanup_security_context_free_ security_context_t filecon = NULL;
 
-        if (!use_selinux() || !label_hnd)
+        if (!mac_selinux_use() || !label_hnd)
                 return 0;
 
         r = selabel_lookup_raw(label_hnd, &filecon, path, mode);
@@ -327,8 +324,6 @@ int mac_selinux_context_set(const char *path, mode_t mode) {
                         log_error("Failed to set SELinux file context on %s: %m", path);
                         r = -errno;
                 }
-
-                freecon(filecon);
         }
 
         if (r < 0 && security_getenforce() == 0)
@@ -341,7 +336,7 @@ int mac_selinux_context_set(const char *path, mode_t mode) {
 int mac_selinux_socket_set(const char *label) {
 
 #ifdef HAVE_SELINUX
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return 0;
 
         if (setsockcreatecon((security_context_t) label) < 0) {
@@ -361,7 +356,7 @@ void mac_selinux_context_clear(void) {
 #ifdef HAVE_SELINUX
         PROTECT_ERRNO;
 
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return;
 
         setfscreatecon(NULL);
@@ -373,7 +368,7 @@ void mac_selinux_socket_clear(void) {
 #ifdef HAVE_SELINUX
         PROTECT_ERRNO;
 
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return;
 
         setsockcreatecon(NULL);
@@ -383,7 +378,7 @@ void mac_selinux_socket_clear(void) {
 void mac_selinux_free(const char *label) {
 
 #ifdef HAVE_SELINUX
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return;
 
         freecon((security_context_t) label);
@@ -395,7 +390,7 @@ int mac_selinux_mkdir(const char *path, mode_t mode) {
 
 #ifdef HAVE_SELINUX
         /* Creates a directory and labels it according to the SELinux policy */
-        security_context_t fcon = NULL;
+        _cleanup_security_context_free_ security_context_t fcon = NULL;
 
         if (!label_hnd)
                 return 0;
@@ -430,7 +425,6 @@ int mac_selinux_mkdir(const char *path, mode_t mode) {
 
 finish:
         setfscreatecon(NULL);
-        freecon(fcon);
 #endif
 
         return r;
@@ -441,7 +435,7 @@ int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
         /* Binds a socket and label its file system object according to the SELinux policy */
 
 #ifdef HAVE_SELINUX
-        security_context_t fcon = NULL;
+        _cleanup_security_context_free_ security_context_t fcon = NULL;
         const struct sockaddr_un *un;
         char *path;
         int r;
@@ -450,7 +444,7 @@ int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
         assert(addr);
         assert(addrlen >= sizeof(sa_family_t));
 
-        if (!use_selinux() || !label_hnd)
+        if (!mac_selinux_use() || !label_hnd)
                 goto skipped;
 
         /* Filter out non-local sockets */
@@ -498,8 +492,6 @@ int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
 
 finish:
         setfscreatecon(NULL);
-        freecon(fcon);
-
         return r;
 
 skipped:
@@ -511,7 +503,7 @@ int mac_selinux_apply(const char *path, const char *label) {
         int r = 0;
 
 #ifdef HAVE_SELINUX
-        if (!use_selinux())
+        if (!mac_selinux_use())
                 return 0;
 
         r = setfilecon(path, (char *)label);