39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
diff -ur systemd-stable-245.5/src/basic/selinux-util.c systemd-stable-245.5.new/src/basic/selinux-util.c
|
||
|
|
--- systemd-stable-245.5/src/basic/selinux-util.c 2020-04-17 12:37:12.000000000 +0000
|
||
|
|
+++ systemd-stable-245.5.new/src/basic/selinux-util.c 2020-06-30 13:33:03.366587133 +0000
|
||
|
|
@@ -60,7 +60,6 @@
|
||
|
|
|
||
|
|
#if HAVE_SELINUX
|
||
|
|
usec_t before_timestamp, after_timestamp;
|
||
|
|
- struct mallinfo before_mallinfo, after_mallinfo;
|
||
|
|
|
||
|
|
if (label_hnd)
|
||
|
|
return 0;
|
||
|
|
@@ -68,7 +67,6 @@
|
||
|
|
if (!mac_selinux_use())
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
- before_mallinfo = mallinfo();
|
||
|
|
before_timestamp = now(CLOCK_MONOTONIC);
|
||
|
|
|
||
|
|
label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
|
||
|
|
@@ -77,16 +75,11 @@
|
||
|
|
r = security_getenforce() == 1 ? -errno : 0;
|
||
|
|
} else {
|
||
|
|
char timespan[FORMAT_TIMESPAN_MAX];
|
||
|
|
- int l;
|
||
|
|
|
||
|
|
after_timestamp = now(CLOCK_MONOTONIC);
|
||
|
|
- after_mallinfo = mallinfo();
|
||
|
|
|
||
|
|
- l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
|
||
|
|
-
|
||
|
|
- log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
|
||
|
|
- format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
|
||
|
|
- (l+1023)/1024);
|
||
|
|
+ log_debug("Successfully loaded SELinux database in %s",
|
||
|
|
+ format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|