X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fima-setup.c;h=7bffd8d9dd48cd14be3c4fd59c1672c0d0369cac;hb=4ab72d6fb499c2b4d8baced9fa94a8bbfa5a4b3d;hp=03e43dcf16b7e37d5b9d26e6522090848631d518;hpb=b30e2f4c18ad81b04e4314fd191a5d458553773c;p=elogind.git

diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 03e43dcf1..7bffd8d9d 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -8,16 +8,16 @@
                                      TORSEC group -- http://security.polito.it
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -44,72 +44,63 @@
 int ima_setup(void) {
 
 #ifdef HAVE_IMA
-       struct stat st;
-       ssize_t policy_size = 0, written = 0;
-       char *policy;
-       int policyfd = -1, imafd = -1;
-       int result = 0;
-
-#ifndef HAVE_SELINUX
-       /* Mount the securityfs filesystem */
-       mount_setup_early();
-#endif
-
-       if (stat(IMA_POLICY_PATH, &st) < 0)
-               return 0;
-
-       policy_size = st.st_size;
-       if (stat(IMA_SECFS_DIR, &st) < 0) {
-               log_debug("IMA support is disabled in the kernel, ignoring.");
-               return 0;
-       }
-
-       if (stat(IMA_SECFS_POLICY, &st) < 0) {
-               log_error("Another IMA custom policy has already been loaded, "
-                         "ignoring.");
-               return 0;
-       }
-
-       policyfd = open(IMA_POLICY_PATH, O_RDONLY|O_CLOEXEC);
-       if (policyfd < 0) {
-               log_error("Failed to open the IMA custom policy file %s (%m), "
-                         "ignoring.", IMA_POLICY_PATH);
-               return 0;
-       }
-
-       imafd = open(IMA_SECFS_POLICY, O_WRONLY|O_CLOEXEC);
-       if (imafd < 0) {
-               log_error("Failed to open the IMA kernel interface %s (%m), "
-                         "ignoring.", IMA_SECFS_POLICY);
-               goto out;
-       }
-
-       policy = mmap(NULL, policy_size, PROT_READ, MAP_PRIVATE, policyfd, 0);
-       if (policy == MAP_FAILED) {
-               log_error("mmap() failed (%m), freezing");
-               result = -errno;
-               goto out;
-       }
-
-       written = loop_write(imafd, policy, (size_t)policy_size, false);
-       if (written != policy_size) {
-               log_error("Failed to load the IMA custom policy file %s (%m), "
-                         "ignoring.", IMA_POLICY_PATH);
-               goto out_mmap;
-       }
-
-       log_info("Successfully loaded the IMA custom policy %s.",
-                IMA_POLICY_PATH);
+        struct stat st;
+        ssize_t policy_size = 0, written = 0;
+        char *policy;
+        _cleanup_close_ int policyfd = -1, imafd = -1;
+        int result = 0;
+
+        if (stat(IMA_POLICY_PATH, &st) < 0)
+                return 0;
+
+        policy_size = st.st_size;
+        if (stat(IMA_SECFS_DIR, &st) < 0) {
+                log_debug("IMA support is disabled in the kernel, ignoring.");
+                return 0;
+        }
+
+        if (stat(IMA_SECFS_POLICY, &st) < 0) {
+                log_error("Another IMA custom policy has already been loaded, "
+                          "ignoring.");
+                return 0;
+        }
+
+        policyfd = open(IMA_POLICY_PATH, O_RDONLY|O_CLOEXEC);
+        if (policyfd < 0) {
+                log_error("Failed to open the IMA custom policy file %s (%m), "
+                          "ignoring.", IMA_POLICY_PATH);
+                return 0;
+        }
+
+        imafd = open(IMA_SECFS_POLICY, O_WRONLY|O_CLOEXEC);
+        if (imafd < 0) {
+                log_error("Failed to open the IMA kernel interface %s (%m), "
+                          "ignoring.", IMA_SECFS_POLICY);
+                goto out;
+        }
+
+        policy = mmap(NULL, policy_size, PROT_READ, MAP_PRIVATE, policyfd, 0);
+        if (policy == MAP_FAILED) {
+                log_error("mmap() failed (%m), freezing");
+                result = -errno;
+                goto out;
+        }
+
+        written = loop_write(imafd, policy, (size_t)policy_size, false);
+        if (written != policy_size) {
+                log_error("Failed to load the IMA custom policy file %s (%m), "
+                          "ignoring.", IMA_POLICY_PATH);
+                goto out_mmap;
+        }
+
+        log_info("Successfully loaded the IMA custom policy %s.",
+                 IMA_POLICY_PATH);
 out_mmap:
-       munmap(policy, policy_size);
+        munmap(policy, policy_size);
 out:
-       if (policyfd >= 0)
-                close_nointr_nofail(policyfd);
-       if (imafd >= 0)
-                close_nointr_nofail(imafd);
-       if (result)
-                return result;
+        if (result)
+                 return result;
 #endif /* HAVE_IMA */
 
-       return 0;
+        return 0;
 }