picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

label: generalize label_get_socket_label_from_exe() a bit

Browse source
This commit is contained in:
Lennart Poettering 2011-07-28 23:39:29 +02:00
parent d605b2fd41
commit 189583d7e4
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/label.c
View file

@ -48,8 +48,8 @@ int label_init(void) {
int r = 0;
#ifdef HAVE_SELINUX
usec_t n;
struct mallinfo before;
usec_t before_timestamp, after_timestamp;
struct mallinfo before_mallinfo, after_mallinfo;
if (!use_selinux())
return 0;
@ -57,8 +57,8 @@ int label_init(void) {
if (label_hnd)
return 0;
before = mallinfo();
n = now(CLOCK_MONOTONIC);
before_mallinfo = mallinfo();
before_timestamp = now(CLOCK_MONOTONIC);
label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
if (!label_hnd) {
@ -66,18 +66,17 @@ int label_init(void) {
"Failed to initialize SELinux context: %m");
r = security_getenforce() == 1 ? -errno : 0;
} else {
char buf[FORMAT_TIMESPAN_MAX];
struct mallinfo after;
char timespan[FORMAT_TIMESPAN_MAX];
int l;
n = now(CLOCK_MONOTONIC) - n;
after = mallinfo();
after_timestamp = now(CLOCK_MONOTONIC);
after_mallinfo = mallinfo();
l = after.uordblks > before.uordblks ? after.uordblks - before.uordblks : 0;
l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
log_info("Successfully loaded SELinux database in %s, size on heap is %iK.",
format_timespan(buf, sizeof(buf), n),
l/1024);
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp),
(l+1023)/1024);
}
#endif
@ -134,7 +133,7 @@ void label_finish(void) {
#endif
}
int label_get_socket_label_from_exe(const char *exe, char **label) {
int label_get_create_label_from_exe(const char *exe, char **label) {
int r = 0;

2
src/label.h
View file

@ -39,7 +39,7 @@ void label_file_clear(void);
void label_free(const char *label);
int label_get_socket_label_from_exe(const char *exe, char **label);
int label_get_create_label_from_exe(const char *exe, char **label);
int label_mkdir(const char *path, mode_t mode);

7
src/socket.c
View file

@ -892,11 +892,14 @@ static int socket_open_fds(Socket *s) {
if ((r = socket_instantiate_service(s)) < 0)
return r;
if (s->service && s->service->exec_command[SERVICE_EXEC_START])
if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0) {
if (s->service && s->service->exec_command[SERVICE_EXEC_START]) {
r = label_get_create_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label);
if (r < 0) {
if (r != -EPERM)
return r;
}
}
know_label = true;
}