chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
553acb7
)
ima-setup: simplify
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 2 Dec 2014 01:47:37 +0000
(20:47 -0500)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Wed, 10 Dec 2014 02:47:53 +0000
(21:47 -0500)
src/core/ima-setup.c
patch
|
blob
|
history
diff --git
a/src/core/ima-setup.c
b/src/core/ima-setup.c
index 3470ca1768cd2a28d15bc4418b0313e463f919dd..8e4fed17e7fc327d5356234468e810539fe1b30d 100644
(file)
--- a/
src/core/ima-setup.c
+++ b/
src/core/ima-setup.c
@@
-24,18
+24,14
@@
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
+#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stat.h>
-#include <
sys/mman
.h>
+#include <
fcntl
.h>
#include "ima-setup.h"
#include "ima-setup.h"
-#include "mount-setup.h"
-#include "macro.h"
+#include "copy.h"
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
-#include "label.h"
#define IMA_SECFS_DIR "/sys/kernel/security/ima"
#define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy"
#define IMA_SECFS_DIR "/sys/kernel/security/ima"
#define IMA_SECFS_POLICY IMA_SECFS_DIR "/policy"
@@
-45,58
+41,37
@@
int ima_setup(void) {
int r = 0;
#ifdef HAVE_IMA
int r = 0;
#ifdef HAVE_IMA
- struct stat st;
- ssize_t policy_size = 0;
- char *policy;
_cleanup_close_ int policyfd = -1, imafd = -1;
_cleanup_close_ int policyfd = -1, imafd = -1;
- if (stat(IMA_POLICY_PATH, &st) < 0)
- return 0;
-
- policy_size = st.st_size;
- if (stat(IMA_SECFS_DIR, &st) < 0) {
+ if (access(IMA_SECFS_DIR, F_OK) < 0) {
log_debug("IMA support is disabled in the kernel, ignoring.");
return 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.");
+ policyfd = open(IMA_POLICY_PATH, O_RDONLY|O_CLOEXEC);
+ if (policyfd < 0) {
+ log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, errno,
+ "Failed to open the IMA custom policy file "IMA_POLICY_PATH", ignoring: %m");
return 0;
}
return 0;
}
- policyfd = open(IMA_POLICY_PATH, O_RDONLY|O_CLOEXEC);
- if (policyfd < 0) {
- log_error_errno(errno, "Failed to open the IMA custom policy file %s (%m), ignoring.",
- IMA_POLICY_PATH);
+ if (access(IMA_SECFS_POLICY, F_OK) < 0) {
+ log_warning("Another IMA custom policy has already been loaded, ignoring.");
return 0;
}
imafd = open(IMA_SECFS_POLICY, O_WRONLY|O_CLOEXEC);
if (imafd < 0) {
return 0;
}
imafd = open(IMA_SECFS_POLICY, O_WRONLY|O_CLOEXEC);
if (imafd < 0) {
- 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_errno(errno, "mmap() failed (%m), freezing");
- r = -errno;
- goto out;
+ log_error_errno(errno, "Failed to open the IMA kernel interface "IMA_SECFS_POLICY", ignoring: %m");
+ return 0;
}
}
- 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;
- }
+ r = copy_bytes(policyfd, imafd, -1);
+ if (r < 0)
+ log_error_errno(r, "Failed to load the IMA custom policy file "IMA_POLICY_PATH": %m");
+ else
+ log_info("Successfully loaded the IMA custom policy "IMA_POLICY_PATH".");
- log_info("Successfully loaded the IMA custom policy %s.",
- IMA_POLICY_PATH);
-out_mmap:
- munmap(policy, policy_size);
-out:
#endif /* HAVE_IMA */
return r;
}
#endif /* HAVE_IMA */
return r;
}