summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-19 16:13:42 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-19 16:23:43 +0100
commit708e25e137f8938791b72194a3d56c3476793175 (patch)
treebeb2379ad61d03d5a883b1ce0bf85a2c522cb803 /src
parentd5eff74097df9f6ef24ad6e4d972961ba304368d (diff)
label: minor optimizations
Diffstat (limited to 'src')
-rw-r--r--src/shared/label.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/shared/label.c b/src/shared/label.c
index 4a26ba9c5d..92f10f9f90 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -137,7 +137,10 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
void label_finish(void) {
#ifdef HAVE_SELINUX
- if (use_selinux() && label_hnd)
+ if (!use_selinux())
+ return;
+
+ if (label_hnd)
selabel_close(label_hnd);
#endif
}
@@ -260,8 +263,8 @@ int label_mkdir(const char *path, mode_t mode) {
/* Creates a directory and labels it according to the SELinux policy */
#ifdef HAVE_SELINUX
- int r;
security_context_t fcon = NULL;
+ int r;
if (!use_selinux() || !label_hnd)
goto skipped;
@@ -269,14 +272,13 @@ int label_mkdir(const char *path, mode_t mode) {
if (path_is_absolute(path))
r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFDIR);
else {
- char *newpath;
+ _cleanup_free_ char *newpath;
newpath = path_make_absolute_cwd(path);
if (!newpath)
return -ENOMEM;
r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFDIR);
- free(newpath);
}
if (r == 0)
@@ -311,10 +313,10 @@ int label_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
- int r;
security_context_t fcon = NULL;
const struct sockaddr_un *un;
- char *path = NULL;
+ char *path;
+ int r;
assert(fd >= 0);
assert(addr);
@@ -336,24 +338,18 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
if (un->sun_path[0] == 0)
goto skipped;
- path = strndup(un->sun_path, addrlen - offsetof(struct sockaddr_un, sun_path));
- if (!path)
- return -ENOMEM;
+ path = strndupa(un->sun_path, addrlen - offsetof(struct sockaddr_un, sun_path));
if (path_is_absolute(path))
r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFSOCK);
else {
- char *newpath;
+ _cleanup_free_ char *newpath;
newpath = path_make_absolute_cwd(path);
-
- if (!newpath) {
- free(path);
+ if (!newpath)
return -ENOMEM;
- }
r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFSOCK);
- free(newpath);
}
if (r == 0)
@@ -375,7 +371,6 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
finish:
setfscreatecon(NULL);
freecon(fcon);
- free(path);
return r;