treewide: sanitize loop_write

[elogind.git] / src / core / ima-setup.c

diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 7bffd8d9dd48cd14be3c4fd59c1672c0d0369cac..3470ca1768cd2a28d15bc4418b0313e463f919dd 100644 (file)
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -42,13 +42,13 @@
 #define IMA_POLICY_PATH "/etc/ima/ima-policy"
 
 int ima_setup(void) {
+        int r = 0;
 
 #ifdef HAVE_IMA
         struct stat st;
-        ssize_t policy_size = 0, written = 0;
+        ssize_t policy_size = 0;
         char *policy;
         _cleanup_close_ int policyfd = -1, imafd = -1;
-        int result = 0;
 
         if (stat(IMA_POLICY_PATH, &st) < 0)
                 return 0;
@@ -60,36 +60,35 @@ int ima_setup(void) {
         }
 
         if (stat(IMA_SECFS_POLICY, &st) < 0) {
-                log_error("Another IMA custom policy has already been loaded, "
-                          "ignoring.");
+                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);
+                log_error_errno(errno, "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);
+                log_error_errno(errno, "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;
+                log_error_errno(errno, "mmap() failed (%m), freezing");
+                r = -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);
+        r = loop_write(imafd, policy, (size_t)policy_size, false);
+        if (r < 0) {
+                log_error_errno(r, "Failed to load the IMA custom policy file %s (%m), ignoring.",
+                                IMA_POLICY_PATH);
                 goto out_mmap;
         }
 
@@ -98,9 +97,6 @@ int ima_setup(void) {
 out_mmap:
         munmap(policy, policy_size);
 out:
-        if (result)
-                 return result;
 #endif /* HAVE_IMA */
-
-        return 0;
+        return r;
 }