[gentoo-commits] proj/elfix:paxmark-libs commit in: /

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     c0bc8c48e5e664339508dbc065d4b5d020bedd8c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 21:26:21 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 21:26:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=c0bc8c48

Makefile.am: added all four possible markings

---
 Makefile.am |   19 +++++++++++++++++--
 libmypax.c  |    2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 70e4cd3..e00cd28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,16 +14,31 @@ poc.sh:
 	@echo "================================================================================"
 	@echo
 	@/sbin/paxctl -M $(libdir)/libmypax.so
-	@/sbin/paxctl -v $(libdir)/libmypax.so 2>/dev/null
+	@/sbin/paxctl -M $(bindir)/testpax
+	@/sbin/paxctl -v $(libdir)/libmypax.so $(bindir)/testpax 2>/dev/null
 	@echo
 	$(bindir)/testpax
 	@echo
 	@echo "========================================"
 	@echo
 	@/sbin/paxctl -m $(libdir)/libmypax.so
-	@/sbin/paxctl -v $(libdir)/libmypax.so 2>/dev/null
+	@/sbin/paxctl -M $(bindir)/testpax
+	@/sbin/paxctl -v $(libdir)/libmypax.so $(bindir)/testpax 2>/dev/null
 	@echo
 	$(bindir)/testpax
 	@echo
+	@echo "========================================"
+	@echo
+	@/sbin/paxctl -M $(libdir)/libmypax.so
+	@/sbin/paxctl -m $(bindir)/testpax
+	@/sbin/paxctl -v $(libdir)/libmypax.so $(bindir)/testpax 2>/dev/null
+	@echo
+	@echo "========================================"
+	@echo
+	@/sbin/paxctl -m $(libdir)/libmypax.so
+	@/sbin/paxctl -m $(bindir)/testpax
+	@/sbin/paxctl -v $(libdir)/libmypax.so $(bindir)/testpax 2>/dev/null
+	@echo
+	@echo
 	@echo "================================================================================"
 

diff --git a/libmypax.c b/libmypax.c
index d09e79c..8ab47da 100644
--- a/libmypax.c
+++ b/libmypax.c
@@ -7,7 +7,7 @@
 void
 doit() {
 	printf("Doing it\n");
-	size_t m = (size_t) mmap( NULL, 4096, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0 );
+	size_t m = (size_t) mmap( NULL, 4096, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0 );
 	if( m == (size_t) MAP_FAILED )
         	printf("%s\n", strerror(errno));
 	printf("Done it\n");