bug#19067: 24.4; temacs startup failure when both PT_PAX and XATTR_PAX flags are enabled in Linux

bug#19067: 24.4; temacs startup failure when both PT_PAX and XATTR_PAX flags are enabled in Linux

[Ulrich Mueller]

Forwarding Gentoo bug reports https://bugs.gentoo.org/497498 and
https://bugs.gentoo.org/526948 :

On a GNU/Linux system with grsecurity/PaX enabled Linux kernel,
temacs startup will fail when both CONFIG_PAX_PT_PAX_FLAGS and
CONFIG_PAX_XATTR_PAX_FLAGS are enabled:

   if test "no" = "yes"; then \
     rm -f bootstrap-emacs; \
     ln temacs bootstrap-emacs; \
   else \
     ./temacs --batch --load loadup bootstrap || exit 1; \
     test "X/sbin/paxctl" = X || /sbin/paxctl -zex emacs; \
     mv -f emacs bootstrap-emacs; \
   fi
   /bin/sh: line 7:  1591 Killed                  ./temacs --batch --load
   loadup bootstrap
   Makefile:815: recipe for target 'bootstrap-emacs' failed
   make[1]: *** [bootstrap-emacs] Error 1
   make[1]: Leaving directory
   '/var/tmp/portage/app-editors/emacs-24.4/work/emacs-24.4/src'
   Makefile:382: recipe for target 'src' failed
   make: *** [src] Error 2

The problem is that paxctl(1) sets the "e" flag ("do not emulate
trampolines") by default for ELF binaries, but setfattr(1) doesn't.
While in principle both settings of the flag would be OK for our case,
Linux (the kernel) refuses to run the binary if the PT_PAX and
XATTR_PAX flags are inconsistent with one another.

Adding the "e" flag also to setfattr fixes this. Patch will follow.

bug#19067: [PATCH] Use consistent paxctl and setfattr flags for temacs.

[Ulrich Müller]

From 7a519d08281d003f26bb4a9048dd5d428fb7f21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Sun, 16 Nov 2014 12:37:54 +0100
Subject: [PATCH] Use consistent paxctl and setfattr flags for temacs.

* Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
for paxctl and setfattr. Fixes temacs startup failure with
grsecurity/PaX enabled Linux kernel (bug#19067).
---
 src/ChangeLog   | 6 ++++++
 src/Makefile.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f9f3a0f..7c690e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-16  Ulrich Müller  <ulm@gentoo.org>
+
+	* Makefile.in (temacs$(EXEEXT)): Use consistent flag settings
+	for paxctl and setfattr. Fixes temacs startup failure with
+	grsecurity/PaX enabled Linux kernel (bug#19067).
+
 2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
diff --git a/src/Makefile.in b/src/Makefile.in
index 70e31b5..99f9981 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -497,7 +497,7 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
 	test "$(CANNOT_DUMP)" = "yes" || \
 	  test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
 	test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \
-	  $(SETFATTR) -n user.pax.flags -v r $@
+	  $(SETFATTR) -n user.pax.flags -v er $@
 
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
-- 
2.1.3

bug#19067: [PATCH] Use consistent paxctl and setfattr flags for temacs.

[Ulrich Mueller]

Any objections against this patch? Otherwise, I would push it to the
emacs-24 branch.