From 74883bcfe68b77c328b7fe5be9e640a4c7bc6629 Mon Sep 17 00:00:00 2001
From: Mark Hindley <mark@hindley.org.uk>
Date: Sun, 4 Nov 2018 11:53:47 +0000
Subject: Fix daemonization. Avoid SIGABRT from mfree() on
 program_invocation_short_name which overlaps with program_invocation_name on
 glibc 2.27, at least.

I am not sure this is the best fix, but it works for now.

Submitted upstream: https://github.com/elogind/elogind/issues/92
---
 ...bc_program_invocation_name_pointer_overlap.diff | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff

(limited to 'debian')

diff --git a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff b/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
new file mode 100644
index 000000000..5f1868272
--- /dev/null
+++ b/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
@@ -0,0 +1,46 @@
+Description: Avoid SIGABRT if program_invocation_short_name is a pointer within progam_invocation_short_name
+Bug: https://github.com/elogind/elogind/issues/92
+
+--- a/src/shared/musl_missing.c
++++ b/src/shared/musl_missing.c
+@@ -34,9 +34,14 @@
+ 
+ static void elogind_free_program_name(void) {
+ 
+-        if (program_invocation_name && (program_invocation_name != program_arg_name) && strlen(program_invocation_name))
++        if (program_invocation_name &&
++            (program_invocation_name != program_arg_name) &&
++            strlen(program_invocation_name))
+                 program_invocation_name       = mfree(program_invocation_name);
+-        if (program_invocation_short_name && (program_invocation_short_name != program_arg_name) && strlen(program_invocation_short_name))
++        if (program_invocation_short_name &&
++            (program_invocation_short_name != program_arg_name) &&
++            (program_invocation_short_name + strlen(program_invocation_short_name) != program_invocation_name + strlen(program_invocation_name))
++            && strlen(program_invocation_short_name))
+                 program_invocation_short_name = mfree(program_invocation_short_name);
+ }
+ 
+--- a/src/basic/process-util.c
++++ b/src/basic/process-util.c
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdio_ext.h>
+ #include <stdlib.h>
++#include <libgen.h>
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <sys/mount.h>
+@@ -306,8 +307,12 @@
+ 
+                 k = strlen(program_invocation_name);
+                 strncpy(program_invocation_name, name, k);
+-                if (l > k)
++                if (l > k) {
+                         truncated = true;
++                        program_invocation_short_name = NULL;
++                }
++                else
++                        program_invocation_short_name = program_invocation_name + strlen(dirname(program_invocation_name)) -1;                        
+         }
+ 
+         /* Third step, completely replace the argv[] array the kernel maintains for us. This requires privileges, but
diff --git a/debian/patches/series b/debian/patches/series
index 295f7f092..33125a623 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 manpage-branding.diff
+Fix_glibc_program_invocation_name_pointer_overlap.diff
-- 
cgit v1.2.3