From 4b6f74f5a0943e0abfa8e6997811f8f7b7f00a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 9 Oct 2020 16:48:03 +0200
Subject: [PATCH] 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.
---
 meson.build              |  1 +
 src/basic/macro.h        |  4 ++++
 src/basic/selinux-util.c | 30 ++++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 889dad781e..c62e0d892b 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 41c2c3289e..d3a5348901 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -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\"")
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 41913fc655..1791aeecde 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -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)