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

basic/selinux: work around mallinfo deprecation 

Latest glibc has deprecated mallinfo(), so it might become unavailable at some point
in the future. There is malloc_info(), but it returns XML, ffs. I think the information
that we get from mallinfo() is quite useful, so let's use mallinfo() if available, and
not otherwise.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-10-09 16:48:03 +02:00 committed by Lennart Poettering
parent d775d8e6f7
commit 4b6f74f5a0
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -532,6 +532,7 @@ foreach ident : [
#include <unistd.h>
#include <signal.h>
#include <sys/wait.h>'''],
['mallinfo', '''#include <malloc.h>'''],
]
have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')

4
src/basic/macro.h
View File

@ -93,6 +93,10 @@
#endif
/* Temporarily disable some warnings */
#define DISABLE_WARNING_DEPRECATED_DECLARATIONS \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
#define DISABLE_WARNING_FORMAT_NONLITERAL \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")

30
src/basic/selinux-util.c
View File

@ -84,14 +84,25 @@ void mac_selinux_retest(void) {
}
#if HAVE_SELINUX
# if HAVE_MALLINFO
static struct mallinfo mallinfo_nowarn(void) {
/* glibc has deprecated mallinfo(), but the replacement malloc_info() returns an XML blob ;=[ */
DISABLE_WARNING_DEPRECATED_DECLARATIONS
return mallinfo();
REENABLE_WARNING
}
# else
# warning "mallinfo() is missing, add mallinfo2() supported instead."
# endif
static int open_label_db(void) {
struct selabel_handle *hnd;
usec_t before_timestamp, after_timestamp;
struct mallinfo before_mallinfo, after_mallinfo;
char timespan[FORMAT_TIMESPAN_MAX];
int l;
before_mallinfo = mallinfo();
# if HAVE_MALLINFO
struct mallinfo before_mallinfo = mallinfo_nowarn();
# endif
before_timestamp = now(CLOCK_MONOTONIC);
hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
@ -99,13 +110,16 @@ static int open_label_db(void) {
return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
after_timestamp = now(CLOCK_MONOTONIC);
after_mallinfo = mallinfo();
l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
# if HAVE_MALLINFO
struct mallinfo after_mallinfo = mallinfo_nowarn();
int 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);
DIV_ROUND_UP(l, 1024));
# else
log_debug("Successfully loaded SELinux database in %s.",
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
# endif
/* release memory after measurement */
if (label_hnd)