diff -Nru paxtest-0.9.11/anonmap.c paxtest-0.9.14/anonmap.c
--- paxtest-0.9.11/anonmap.c	2010-02-21 20:14:52.000000000 +0000
+++ paxtest-0.9.14/anonmap.c	2015-09-29 12:20:26.000000000 +0000
@@ -29,7 +29,7 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)buf;
diff -Nru paxtest-0.9.11/body.c paxtest-0.9.14/body.c
--- paxtest-0.9.11/body.c	2010-10-22 02:01:36.000000000 +0000
+++ paxtest-0.9.14/body.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* body.c - This part is shared by the test programs (except for the randomisation
+/* body.c - This part is shared by the test programs (except for the randomization
  *          tests)
  *
  * Copyright (c)2003,2004 by Peter Busser <peter@adamantix.org>
@@ -16,9 +16,8 @@
 #include <sys/wait.h>
 #include <pthread.h>
 #include <unistd.h>
+#include "body.h"
 
-extern int doit( void );
-extern const char testname[];
 
 static void *test_thread(void *p)
 {
@@ -93,10 +92,12 @@
 {
 	void *ptr;
 	int retval;
-	long PAGESIZE = sysconf(_SC_PAGESIZE);
+	unsigned long pagesize = sysconf(_SC_PAGESIZE);
+	unsigned long offset = (unsigned long) addr & (pagesize - 1);
 
-	/* Allign to a multiple of PAGESIZE, assumed to be a power of two */
-	ptr = (char *)(((unsigned long) addr) & ~(PAGESIZE-1));
+	/* Align to a multiple of PAGESIZE, assumed to be a power of two */
+	ptr = (void *)((unsigned long) addr - offset);
+	len += offset;
 
 	retval = mprotect( ptr, len, prot );
 	if( retval != 0 && (errno == EINVAL)) {
diff -Nru paxtest-0.9.11/body.h paxtest-0.9.14/body.h
--- paxtest-0.9.11/body.h	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/body.h	2015-09-29 12:20:08.000000000 +0000
@@ -1,4 +1,16 @@
+#ifndef _BODY_H_
+#define _BODY_H_
+
+#include <stddef.h>
+
+/* provided by body.c */
 void itworked( void );
 void itfailed( void );
 int do_mprotect( const void *addr, size_t len, int prot );
+
+/* provided by individual tests */
 typedef void (*fptr)(void);
+extern const char testname[];
+void doit( void );
+
+#endif
diff -Nru paxtest-0.9.11/ChangeLog paxtest-0.9.14/ChangeLog
--- paxtest-0.9.11/ChangeLog	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/ChangeLog	2015-09-29 12:30:48.000000000 +0000
@@ -1,88 +1,23 @@
-paxtest (1:0.9.11-2) unstable; urgency=low
+paxtest (0.9.14-1) stable; urgency=low
+  * Various fixes/cleanups including ensuring an overflowing strcpy/memcpy isn't
+    optimized away, from Mathias Krause (mathias.krause@secunet.com)
+  * Updated the representative results
+
+paxtest (0.9.13-1) stable; urgency=low
+  * Added VDSO randomization test
+  * Added basic entropy quality testing, subtracts weak bits from entropy count
+  * Increased iterations for all randomization tests but the exhaustion tests
 
-  * New upstream release, uploaded to Debian. (Closes: #665800)
-     - The upstream fixed the FTBFS error reported - "fix build with ld
-       --as-needed". Makefile.psm now places libraries behind the objects
-       needing their symbols on the commandline when building with ld
-       --as-needed (initially reported with patch by Julian Taylor
-       <jtaylor.debian@googlemail.com>) (LP: #831405) (Closes: #639128)
-  * debian/control: 
-     - Add, as to the list of architectures the following: amd64 sparc powerpc
-     (as they seem to be supported in the source). 
-     - Put full maintainer's name in UTF-8
-  * debian/changelog:
-     - Add changelog of Ubuntu entry
-     - Add dates to upstream releases based on timestamps of files at
-       http://grsecurity.net/~spender/
-  * debian/sample.debian, debian/rules:
-     - Add an output example when running in a Debian system (a kernel that
-     does not include the grsecurity patch)
-
- -- Javier Fernández-Sanguino Peña <jfs@debian.org>  Mon, 04 Nov 2013 19:31:08 +0100
+paxtest (0.9.12-1) stable; urgency=low
+  * Added ARM support
 
 paxtest (0.9.11-1) stable; urgency=low
   * Added display of exhaustion tests
 
- -- Brad Spengler <spender@grsecurity.net>  Thu, 31 Jan 2013 23:21:00 +0200
-
 paxtest (0.9.10-1) stable; urgency=low
   * Fixed compilation problem reported on forums
   * Added display of argv/env randomization
 
- -- Brad Spengler <spender@grsecurity.net>  Thu, 29 Dec 2012 19:42:00 +0200
-
-paxtest (1:0.9.9-1ubuntu1) oneiric; urgency=low
-
-   * Fix FTBFS with ld --as-needed. LP: #831405.
-
- -- Matthias Klose <email address hidden>   Wed, 14 Sep 2011 10:30:24 +0200
-
-paxtest (0.9.9-1) stable; urgency=low
-
-  * added SPARC/64 support
-  * added PPC/64 support (return to function tests should be ignored for PPC64)
-  * added 32/64bit target support
-  * added shellode.h to easily support additional architectures
-  * made paxctl generate the PT_PAX_FLAGS header for binaries that
-    didn't have one
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
-paxtest (1:0.9.9-1) unstable; urgency=medium
-
-   * New upstream release, uploaded to Debian. (LP: #530778) (Closes: #570990)
-   * genpaxtest: Modify so that the 'paxtest' script generated uses 
-        either a user-provided logfile as argument or the $HOME/paxtest.log
-        instead of paxtest.log for its results in order to prevent it from
-        writing in the users' CWD and avoid symlink tricks if the user is
-        executing this in a shared (i.e.  writable by others) directory such as
-        /tmp.  Fixes CVE-2010-3373 (Closes: #598413)
-   * Updated results in the results/ directory for a stock Debian kernel
-     (i.e. no overflow protection)
-   * Use debhelper compatibility version 5
-   * debian/rules: Use conditions to build using 'linux32', 'linux64' or
-     just 'linux'
-   * Document the new Homepage in debian/control, also list both the new
-     and the old one in debian/copyright
-   * Updated debian/paxtest.sgml to properly reflect the arguments used in the 
-     paxtest script and the new behaviour wrt log files.
-   * Fix upstream's debian/changelog to have proper maintainer lines. Use the
-     date information of the files as a basis.
-   * Updated the content under results/ for a stock Debian kernel (2.6.32)
-     and rename the older result files for Debian kernel 2.4.25
-
- -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 28 Sep 2010 23:40:17 +0200
-
-paxtest (0.9.9-3) stable; urgency=low
-  * fixed Makefile to use -nopie for Gentoo Hardened on ET_EXEC tests
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
-paxtest (0.9.9-2) stable; urgency=low
-  * fixed writable text segments test under gcc 4.5 optimizations
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
 paxtest (0.9.9-1) stable; urgency=low
   * added SPARC/64 support
   * added PPC/64 support (return to function tests should be ignored for PPC64)
@@ -91,22 +26,6 @@
   * made paxctl generate the PT_PAX_FLAGS header for binaries that
     didn't have one
 
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
-paxtest (0.9.7-pre4-2) unstable; urgency=low
-
-  * New upstream release.
-  * Build-Depend on linux-kernel-headers (Closes: #382011, #423308)
-  * Fix typo in package description (Closes: #390250)
-  * Use proper Homepage in debian/control
-  * Use debhelper version 4
-  * Remove duplicate content from debian/paxtest.sgml
-  * Fix lintian errors
-  * Change the maintainer's email address
-  * Update Standards-Version
-
- -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org>  Tue, 26 Jun 2007 21:34:15 +0200
-
 paxtest (0.9.7-1) stable; urgency=low
   * Fixed some tests on OpenBSD and FreeBSD (thanks to paxtest@hunger.hu
     and mux@freebsd.org)
@@ -117,17 +36,6 @@
   * Fixed the executable shared library data/bss tests (thanks to
     paxtest@hunger.hu)
 
- -- Peter Busser <peter@devbox.adamantix.org>  Wed, 25 Feb 2004 20:24:53 +0200
-
-paxtest (0.9.6-2) unstable; urgency=low
-
-   * New upstream release, uploaded to debian.
-   * Remove COPYING from debian/docs (generates duplicates)
-   * Added results in the results/ directory for a stock Debian kernel
-     (i.e. no overflow protection)
-
- -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sun,  2 May 2004 21:46:16 +0200
-
 paxtest (0.9.6-1) stable; urgency=low
 
   * Made the do_mprotect() call in body.c optional, thereby introducing two
@@ -146,31 +54,6 @@
 
  -- Peter Busser <peter@devbox.adamantix.org>  Wed, 25 Feb 2004 20:24:53 +0200
 
-paxtest (0.9.5-3) unstable; urgency=low
-
-  * Changed http references to new location at http://pax.grsecurity.net/docs
-    (Closes: #234227)
-  * Fixed typo in debian/copyright and added download location
-
- -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sun, 22 Feb 2004 19:04:53 +0100
- 
-paxtest (0.9.5-2) unstable; urgency=low
-
-  * First version uploaded to Debian (Closes: #222688, #222481)
-  * Modified to run the generic Makefile instead of Adamantix's.
-  * Moved from main section to devel.
-  * Fixed typo in description.
-  * Avoid creation of a logfile in paxtest and instead use redirection
-    tricks to create logfile if asked for and log to stdout/stderr in
-    any other case.
-  * Wrote a manpage for paxtest.
-  * Added Ingo Molnar's patch to check for non-executable thread stacks
-    (since nobody objected to it in the discussion at debian-devel)
-    Retrieved from:
-    http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg00330.html
-
- -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat, 29 Nov 2003 20:28:46 +0100
- 
 paxtest (0.9.5-1) unstable; urgency=low
 
   * Fixed the shlibbss and shlibdata tests (pageexec@freemail.hu)
diff -Nru paxtest-0.9.11/crt1S.S paxtest-0.9.14/crt1S.S
--- paxtest-0.9.11/crt1S.S	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/crt1S.S	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-	.text
-	.globl _start
-	.type _start,@function
-_start:
-	popl %esi
-	movl %esp, %ecx	
-	andl $0xfffffff0, %esp
-	call .L1
-.L1:
-	pop %ebp
-	addl $_GLOBAL_OFFSET_TABLE_+[.-.L1],%ebp
-	pushl %eax
-	pushl %esp
-	pushl %edx
-	pushl _fini@GOT(%ebp)
-	pushl _init@GOT(%ebp)
-	pushl %ecx
-	pushl %esi
-	pushl main@GOT(%ebp)
-	pushl .hlt@GOT(%ebp)
-	pushl __libc_start_main@GOT(%ebp)
-	xorl %ebp, %ebp
-	ret
-.hlt:
-	hlt
-
-	.section .rodata
-	.globl _fp_hw
-_fp_hw:	.long 3
-	.size _fp_hw, 4
-	.type _fp_hw,@object
-
-	.data
-	.globl __data_start
-__data_start:
-	.long 0
-	.weak data_start
-	data_start = __data_start
-
-	.section ".note.ABI-tag", "a"
-	.align 4
-	.long 1f - 0f
-	.long 3f - 2f
-	.long  1
-0:	.asciz "GNU"
-1:	.align 4
-2:	.long 0
-	.long 2,0,0
-3:	.align 4
-
-	.section .rodata
-	.globl _IO_stdin_used
-	.align 4
-_IO_stdin_used:
-	.long 0x20001
-	.size _IO_stdin_used,4
-	.type _IO_stdin_used,@object
diff -Nru paxtest-0.9.11/debian/changelog paxtest-0.9.14/debian/changelog
--- paxtest-0.9.11/debian/changelog	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/debian/changelog	2016-05-02 19:37:22.000000000 +0000
@@ -1,3 +1,54 @@
+paxtest (1:0.9.14-2) unstable; urgency=low
+
+  * debian/control: Add quilt to Build-Depends as required with the changes introduced
+    in the previous version
+  * debian/watch: Add file based on the watch file available provided by 
+    Bart Martens and available in: 
+    http://anonscm.debian.org/viewvc/sepwatch/trunk/watchfiles/
+  * Add new results files (Debian_sid_Linux_4_4_grsec_2016.blackhat,
+    Debian_sid_Linux_4_4_grsec_2016.kiddie) provided by 'Esokrates' based on
+    the execution of paxtest in a Linux 4.4 kernel with grsecurity
+  * Add a README file documenting what paxtest execution examples are provided 
+
+ -- Javier Fernández-Sanguino Peña <jfs@debian.org>  Mon, 02 May 2016 21:16:13 +0200
+
+paxtest (1:0.9.14-1) unstable; urgency=medium
+
+  * New upstream release and upload to Debian
+     - This release fixes the incomplete output issue reported 
+       in standard kernels (Closes:  #779316)
+  * debian/docs: Adjust with the contents now available from upstream
+  * debian/rules: Simplify the package construction by converting it to
+    debhelper
+  * Convert into 3.0 quilt format and move patches to debian/patches:
+     - 01_add_results.diff  - add paxtest results from some systems
+     - 02_change_log_file_location.diff - change location of paxtest logfile
+     - 03_paxtest_add_info.diff - Add more information to paxtest logfile
+     - 04_remove_void_function.diff: Add patch to fix bug 758566 as provided
+       in the bug report. This patch is not applied yet as we do not know if
+       this impacts the tests themselves and is required by the paxtest
+       program.
+  * Create example results for execution in a Linux sid system using
+    kernel 4.4
+  * Move the results from docs to examples. Do not ship the Adamantix sample
+    anymore as the project is defunct
+
+ -- Javier Fernández-Sanguino Peña <jfs@debian.org>  Sat, 30 Apr 2016 13:47:59 +0200
+
+paxtest (0.9.13-1) stable; urgency=low
+
+  * Added VDSO randomization test
+  * Added basic entropy quality testing, subtracts weak bits from entropy count
+  * Increased iterations for all randomization tests but the exhaustion tests
+
+ -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
+
+paxtest (0.9.12-1) stable; urgency=low
+
+  * Added ARM support
+
+ -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
+
 paxtest (1:0.9.11-2) unstable; urgency=low
 
   * New upstream release, uploaded to Debian. (Closes: #665800)
@@ -21,11 +72,13 @@
  -- Javier Fernández-Sanguino Peña <jfs@debian.org>  Mon, 04 Nov 2013 19:31:08 +0100
 
 paxtest (0.9.11-1) stable; urgency=low
+
   * Added display of exhaustion tests
 
  -- Brad Spengler <spender@grsecurity.net>  Thu, 31 Jan 2013 23:21:00 +0200
 
 paxtest (0.9.10-1) stable; urgency=low
+
   * Fixed compilation problem reported on forums
   * Added display of argv/env randomization
 
@@ -37,17 +90,6 @@
 
  -- Matthias Klose <email address hidden>   Wed, 14 Sep 2011 10:30:24 +0200
 
-paxtest (0.9.9-1) stable; urgency=low
-
-  * added SPARC/64 support
-  * added PPC/64 support (return to function tests should be ignored for PPC64)
-  * added 32/64bit target support
-  * added shellode.h to easily support additional architectures
-  * made paxctl generate the PT_PAX_FLAGS header for binaries that
-    didn't have one
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
 paxtest (1:0.9.9-1) unstable; urgency=medium
 
    * New upstream release, uploaded to Debian. (LP: #530778) (Closes: #570990)
@@ -73,17 +115,8 @@
 
  -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 28 Sep 2010 23:40:17 +0200
 
-paxtest (0.9.9-3) stable; urgency=low
-  * fixed Makefile to use -nopie for Gentoo Hardened on ET_EXEC tests
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
-paxtest (0.9.9-2) stable; urgency=low
-  * fixed writable text segments test under gcc 4.5 optimizations
-
- -- Brad Spengler <spender@grsecurity.net>  Thu, 26 Aug 2010 19:17:00 +0200
-
 paxtest (0.9.9-1) stable; urgency=low
+
   * added SPARC/64 support
   * added PPC/64 support (return to function tests should be ignored for PPC64)
   * added 32/64bit target support
@@ -108,6 +141,7 @@
  -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org>  Tue, 26 Jun 2007 21:34:15 +0200
 
 paxtest (0.9.7-1) stable; urgency=low
+
   * Fixed some tests on OpenBSD and FreeBSD (thanks to paxtest@hunger.hu
     and mux@freebsd.org)
   * Fixed return address acquisition, still gcc specific
diff -Nru paxtest-0.9.11/debian/clean paxtest-0.9.14/debian/clean
--- paxtest-0.9.11/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/clean	2016-04-30 14:19:30.000000000 +0000
@@ -0,0 +1,2 @@
+paxtest.1
+test
diff -Nru paxtest-0.9.11/debian/control paxtest-0.9.14/debian/control
--- paxtest-0.9.11/debian/control	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/debian/control	2016-05-02 19:08:13.000000000 +0000
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
-Build-Depends: debhelper (>> 3.0.0), docbook-to-man, linux-kernel-headers
-Standards-Version: 3.7.2.2
+Build-Depends: debhelper (>=9), docbook-to-man, linux-kernel-headers, quilt
+Standards-Version: 3.9.6
 Homepage: http://www.grsecurity.net/~spender/
 
 Package: paxtest
diff -Nru paxtest-0.9.11/debian/docs paxtest-0.9.14/debian/docs
--- paxtest-0.9.11/debian/docs	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/debian/docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-README
-results/Results.README
-results/Adamantix.kiddie
-results/Adamantix.blackhat
-results/Gentoo.blackhat
-results/Debian.kiddie
-results/Debian.blackhat
diff -Nru paxtest-0.9.11/debian/manpage.1.ex paxtest-0.9.14/debian/manpage.1.ex
--- paxtest-0.9.11/debian/manpage.1.ex	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/debian/manpage.1.ex	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PAXTEST SECTION "May 19, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-paxtest \- program to do something
-.SH SYNOPSIS
-.B paxtest
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B paxtest
-and
-.B bar
-commands.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBpaxtest\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-This manual page was written by Peter Busser <peter@dev>,
-for the Debian GNU/Linux system (but may be used by others).
diff -Nru paxtest-0.9.11/debian/manpage.sgml.ex paxtest-0.9.14/debian/manpage.sgml.ex
--- paxtest-0.9.11/debian/manpage.sgml.ex	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/debian/manpage.sgml.ex	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>May 19, 2003</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>peter@dev</email>">
-  <!ENTITY dhusername  "Peter Busser">
-  <!ENTITY dhucpackage "<refentrytitle>PAXTEST</refentrytitle>">
-  <!ENTITY dhpackage   "paxtest">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> Free Documentation
-      License, Version 1.1 or any later version published by the Free
-      Software Foundation; with no Invariant Sections, no Front-Cover
-      Texts and no Back-Cover Texts.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff -Nru paxtest-0.9.11/debian/patches/01_add_results.diff paxtest-0.9.14/debian/patches/01_add_results.diff
--- paxtest-0.9.11/debian/patches/01_add_results.diff	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/patches/01_add_results.diff	2016-05-02 19:36:34.000000000 +0000
@@ -0,0 +1,384 @@
+Description: Add example results of paxtest execution
+ Add some text files showing the result of the paxtest
+ execution in different systems (including Debian).
+ These will be provided in the package's documentation
+ for reference.
+Author: Javier Fernández-Sanguino Peña <jfs@debian.org>
+Forwarded: no
+Last-Update: <2016-04-30>
+
+
+--- /dev/null
++++ b/results/Debian_sid_Linux_2_4_2007.blackhat
+@@ -0,0 +1,33 @@
++PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
++Released under the GNU Public Licence version 2 or later
++
++Mode: blackhat
++Linux silicio 2.4.25-1-686 #1 Tue Feb 24 10:55:59 EST 2004 i686 GNU/Linux
++
++Executable anonymous mapping             : Vulnerable
++Executable bss                           : Vulnerable
++Executable data                          : Vulnerable
++Executable heap                          : Vulnerable
++Executable stack                         : Vulnerable
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Anonymous mapping randomisation test     : No randomisation
++Heap randomisation test (ET_EXEC)        : No randomisation
++Heap randomisation test (ET_DYN)         : No randomisation
++Main executable randomisation (ET_EXEC)  : No randomisation
++Main executable randomisation (ET_DYN)   : No randomisation
++Shared library randomisation test        : No randomisation
++Stack randomisation test (SEGMEXEC)      : No randomisation
++Stack randomisation test (PAGEEXEC)      : No randomisation
++Return to function (strcpy)              : Vulnerable
++Return to function (strcpy, RANDEXEC)    : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (memcpy, RANDEXEC)    : Vulnerable
++Executable shared library bss            : Vulnerable
++Executable shared library data           : Vulnerable
++Writable text segments                   : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_2_4_2007.kiddie
+@@ -0,0 +1,33 @@
++PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
++Released under the GNU Public Licence version 2 or later
++
++Mode: kiddie
++Linux silicio 2.4.25-1-686 #1 Tue Feb 24 10:55:59 EST 2004 i686 GNU/Linux
++
++Executable anonymous mapping             : Vulnerable
++Executable bss                           : Vulnerable
++Executable data                          : Vulnerable
++Executable heap                          : Vulnerable
++Executable stack                         : Vulnerable
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Anonymous mapping randomisation test     : No randomisation
++Heap randomisation test (ET_EXEC)        : No randomisation
++Heap randomisation test (ET_DYN)         : No randomisation
++Main executable randomisation (ET_EXEC)  : No randomisation
++Main executable randomisation (ET_DYN)   : No randomisation
++Shared library randomisation test        : No randomisation
++Stack randomisation test (SEGMEXEC)      : No randomisation
++Stack randomisation test (PAGEEXEC)      : No randomisation
++Return to function (strcpy)              : Vulnerable
++Return to function (strcpy, RANDEXEC)    : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (memcpy, RANDEXEC)    : Vulnerable
++Executable shared library bss            : Vulnerable
++Executable shared library data           : Vulnerable
++Writable text segments                   : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_2_6_2010.blackhat
+@@ -0,0 +1,33 @@
++PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 
++Linux silicio 2.6.32-5-686 #1 SMP Sat Sep 18 02:14:45 UTC 2010 i686 GNU/Linux
++
++Executable anonymous mapping             : Vulnerable
++Executable bss                           : Vulnerable
++Executable data                          : Vulnerable
++Executable heap                          : Vulnerable
++Executable stack                         : Vulnerable
++Executable shared library bss            : Vulnerable
++Executable shared library data           : Vulnerable
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Writable text segments                   : Vulnerable
++Anonymous mapping randomisation test     : 12 bits (guessed)
++Heap randomisation test (ET_EXEC)        : 13 bits (guessed)
++Heap randomisation test (PIE)            : 16 bits (guessed)
++Main executable randomisation (ET_EXEC)  : No randomisation
++Main executable randomisation (PIE)      : 12 bits (guessed)
++Shared library randomisation test        : 10 bits (guessed)
++Stack randomisation test (SEGMEXEC)      : 19 bits (guessed)
++Stack randomisation test (PAGEEXEC)      : 19 bits (guessed)
++Return to function (strcpy)              : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : Vulnerable
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_2_6_2010.kiddie
+@@ -0,0 +1,33 @@
++PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 
++Linux silicio 2.6.32-5-686 #1 SMP Sat Sep 18 02:14:45 UTC 2010 i686 GNU/Linux
++
++Executable anonymous mapping             : Vulnerable
++Executable bss                           : Vulnerable
++Executable data                          : Vulnerable
++Executable heap                          : Vulnerable
++Executable stack                         : Vulnerable
++Executable shared library bss            : Vulnerable
++Executable shared library data           : Vulnerable
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Writable text segments                   : Vulnerable
++Anonymous mapping randomisation test     : 12 bits (guessed)
++Heap randomisation test (ET_EXEC)        : 14 bits (guessed)
++Heap randomisation test (PIE)            : 16 bits (guessed)
++Main executable randomisation (ET_EXEC)  : No randomisation
++Main executable randomisation (PIE)      : 12 bits (guessed)
++Shared library randomisation test        : 10 bits (guessed)
++Stack randomisation test (SEGMEXEC)      : 19 bits (guessed)
++Stack randomisation test (PAGEEXEC)      : 19 bits (guessed)
++Return to function (strcpy)              : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : Vulnerable
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_4_4_2016.blackhat
+@@ -0,0 +1,45 @@
++PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 1
++Blackhat
++Kernel: 
++Linux silicio 4.4.0-1-686-pae #1 SMP Debian 4.4.6-1 (2016-03-17) i686 GNU/Linux
++
++Relase information: 
++Distributor ID:	Debian
++Description:	Debian GNU/Linux unstable (sid)
++Release:	unstable
++Codename:	sid
++Executable anonymous mapping             : Killed
++Executable bss                           : Killed
++Executable data                          : Killed
++Executable heap                          : Killed
++Executable stack                         : Killed
++Executable shared library bss            : Killed
++Executable shared library data           : Killed
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Writable text segments                   : Vulnerable
++Anonymous mapping randomization test     : 8 quality bits (guessed)
++Heap randomization test (ET_EXEC)        : 13 quality bits (guessed)
++Heap randomization test (PIE)            : 13 quality bits (guessed)
++Main executable randomization (ET_EXEC)  : 8 quality bits (guessed)
++Main executable randomization (PIE)      : 8 quality bits (guessed)
++Shared library randomization test        : 8 quality bits (guessed)
++VDSO randomization test                  : 8 quality bits (guessed)
++Stack randomization test (SEGMEXEC)      : 19 quality bits (guessed)
++Stack randomization test (PAGEEXEC)      : 19 quality bits (guessed)
++Arg/env randomization test (SEGMEXEC)    : 11 quality bits (guessed)
++Arg/env randomization test (PAGEEXEC)    : 11 quality bits (guessed)
++Randomization under memory exhaustion @~0: No randomization
++Randomization under memory exhaustion @0 : No randomization
++Return to function (strcpy)              : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : Vulnerable
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_4_4_2016.kiddie
+@@ -0,0 +1,45 @@
++PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 0
++Kiddie
++Kernel: 
++Linux silicio 4.4.0-1-686-pae #1 SMP Debian 4.4.6-1 (2016-03-17) i686 GNU/Linux
++
++Relase information: 
++Distributor ID:	Debian
++Description:	Debian GNU/Linux unstable (sid)
++Release:	unstable
++Codename:	sid
++Executable anonymous mapping             : Killed
++Executable bss                           : Killed
++Executable data                          : Killed
++Executable heap                          : Killed
++Executable stack                         : Killed
++Executable shared library bss            : Killed
++Executable shared library data           : Killed
++Executable anonymous mapping (mprotect)  : Vulnerable
++Executable bss (mprotect)                : Vulnerable
++Executable data (mprotect)               : Vulnerable
++Executable heap (mprotect)               : Vulnerable
++Executable stack (mprotect)              : Vulnerable
++Executable shared library bss (mprotect) : Vulnerable
++Executable shared library data (mprotect): Vulnerable
++Writable text segments                   : Vulnerable
++Anonymous mapping randomization test     : 8 quality bits (guessed)
++Heap randomization test (ET_EXEC)        : 13 quality bits (guessed)
++Heap randomization test (PIE)            : 13 quality bits (guessed)
++Main executable randomization (ET_EXEC)  : 8 quality bits (guessed)
++Main executable randomization (PIE)      : 8 quality bits (guessed)
++Shared library randomization test        : 8 quality bits (guessed)
++VDSO randomization test                  : 8 quality bits (guessed)
++Stack randomization test (SEGMEXEC)      : 19 quality bits (guessed)
++Stack randomization test (PAGEEXEC)      : 19 quality bits (guessed)
++Arg/env randomization test (SEGMEXEC)    : 11 quality bits (guessed)
++Arg/env randomization test (PAGEEXEC)    : 11 quality bits (guessed)
++Randomization under memory exhaustion @~0: No randomization
++Randomization under memory exhaustion @0 : No randomization
++Return to function (strcpy)              : Vulnerable
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : Vulnerable
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_4_4_grsec_2016.blackhat
+@@ -0,0 +1,46 @@
++PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 1
++Blackhat
++Kernel: 
++Linux debian 4.4.0-1-grsec-amd64 #1 SMP Debian 4.4.8-1+grsec201604252206+1 (2016-04-28) x86_64 GNU/Linux
++
++Relase information: 
++Distributor ID:	Debian
++Description:	Debian GNU/Linux unstable (sid)
++Release:	unstable
++Codename:	sid
++Test results:
++Executable anonymous mapping             : Killed
++Executable bss                           : Killed
++Executable data                          : Killed
++Executable heap                          : Killed
++Executable stack                         : Killed
++Executable shared library bss            : Killed
++Executable shared library data           : Killed
++Executable anonymous mapping (mprotect)  : Killed
++Executable bss (mprotect)                : Killed
++Executable data (mprotect)               : Killed
++Executable heap (mprotect)               : Killed
++Executable stack (mprotect)              : Killed
++Executable shared library bss (mprotect) : Killed
++Executable shared library data (mprotect): Killed
++Writable text segments                   : Killed
++Anonymous mapping randomization test     : 28 quality bits (guessed)
++Heap randomization test (ET_EXEC)        : 22 quality bits (guessed)
++Heap randomization test (PIE)            : 35 quality bits (guessed)
++Main executable randomization (ET_EXEC)  : 28 quality bits (guessed)
++Main executable randomization (PIE)      : 28 quality bits (guessed)
++Shared library randomization test        : 28 quality bits (guessed)
++VDSO randomization test                  : 28 quality bits (guessed)
++Stack randomization test (SEGMEXEC)      : 35 quality bits (guessed)
++Stack randomization test (PAGEEXEC)      : 35 quality bits (guessed)
++Arg/env randomization test (SEGMEXEC)    : 39 quality bits (guessed)
++Arg/env randomization test (PAGEEXEC)    : 39 quality bits (guessed)
++Randomization under memory exhaustion @~0: 28 bits (guessed)
++Randomization under memory exhaustion @0 : 28 bits (guessed)
++Return to function (strcpy)              : paxtest: return address contains a NULL byte.
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : paxtest: return address contains a NULL byte.
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/Debian_sid_Linux_4_4_grsec_2016.kiddie
+@@ -0,0 +1,46 @@
++PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
++Released under the GNU Public Licence version 2 or later
++
++Mode: 0
++Kiddie
++Kernel: 
++Linux debian 4.4.0-1-grsec-amd64 #1 SMP Debian 4.4.8-1+grsec201604252206+1 (2016-04-28) x86_64 GNU/Linux
++
++Relase information: 
++Distributor ID:	Debian
++Description:	Debian GNU/Linux unstable (sid)
++Release:	unstable
++Codename:	sid
++Test results:
++Executable anonymous mapping             : Killed
++Executable bss                           : Killed
++Executable data                          : Killed
++Executable heap                          : Killed
++Executable stack                         : Killed
++Executable shared library bss            : Killed
++Executable shared library data           : Killed
++Executable anonymous mapping (mprotect)  : Killed
++Executable bss (mprotect)                : Killed
++Executable data (mprotect)               : Killed
++Executable heap (mprotect)               : Killed
++Executable stack (mprotect)              : Killed
++Executable shared library bss (mprotect) : Killed
++Executable shared library data (mprotect): Killed
++Writable text segments                   : Killed
++Anonymous mapping randomization test     : 28 quality bits (guessed)
++Heap randomization test (ET_EXEC)        : 22 quality bits (guessed)
++Heap randomization test (PIE)            : 35 quality bits (guessed)
++Main executable randomization (ET_EXEC)  : 28 quality bits (guessed)
++Main executable randomization (PIE)      : 28 quality bits (guessed)
++Shared library randomization test        : 28 quality bits (guessed)
++VDSO randomization test                  : 28 quality bits (guessed)
++Stack randomization test (SEGMEXEC)      : 35 quality bits (guessed)
++Stack randomization test (PAGEEXEC)      : 35 quality bits (guessed)
++Arg/env randomization test (SEGMEXEC)    : 39 quality bits (guessed)
++Arg/env randomization test (PAGEEXEC)    : 39 quality bits (guessed)
++Randomization under memory exhaustion @~0: 28 bits (guessed)
++Randomization under memory exhaustion @0 : 28 bits (guessed)
++Return to function (strcpy)              : paxtest: return address contains a NULL byte.
++Return to function (memcpy)              : Vulnerable
++Return to function (strcpy, PIE)         : paxtest: return address contains a NULL byte.
++Return to function (memcpy, PIE)         : Vulnerable
+--- /dev/null
++++ b/results/README.results
+@@ -0,0 +1,33 @@
++
++Paxtest results' examples
++-------------------------
++
++This directory contains sample logs for the execution of paxtest.  These
++results logs are generated by running paxtest on different kernel.
++configuration in different environments.
++
++Alongside the results distributed by paxtest upstream  (PaX_x86_64.blackhat and
++PaX_x86.blackhat) you will see different results of paxtest execution in:
++
++- The standard Linux kernels in Debian 'sid' (unstable) distribution for
++  different years (2.4 kernel - 2007, 2.6 kernel in 2010, 4.4 kernel in 2016)
++
++  The early 2.x series of kernel did not include any stack-protection features
++  at all. Later kernels (4.4) do provide some security features.
++
++- Linux kernels patched with grsecurity as distributed in Debian 'sid' in 2016
++  which provide most of the security features provied by the GRsecurity patch
++
++    For more information on Grsecurity, please see
++
++    https://wiki.debian.org/grsecurity (Debian-specific)
++
++    or
++
++    https://grsecurity.net/
++
++
++---------------------------------
++Javier Fernández-Sanguino <jfs@debian.org>
++Mon, 02 May 2016 21:35:28 +0200
++
diff -Nru paxtest-0.9.11/debian/patches/02_change_log_file_location.diff paxtest-0.9.14/debian/patches/02_change_log_file_location.diff
--- paxtest-0.9.11/debian/patches/02_change_log_file_location.diff	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/patches/02_change_log_file_location.diff	2016-04-30 14:53:30.000000000 +0000
@@ -0,0 +1,88 @@
+Description: Change location of log file in paxtest
+ Change location of the paxtest shell script so that 
+ it default location is the user's HOME directory.
+ .
+ Also add an option to define the logfile location
+ in the command line
+Author: Javier Fernández-Sanguino Peña <jfs@debian.org>
+Forwarded: no
+Last-Update: <2016-04-30>
+
+--- a/README
++++ b/README
+@@ -50,7 +50,7 @@
+ 
+ ./paxtest blackhat	(to run paxtest in blackhat mode)
+ 
+-This will create a file paxtest.log in the current directory.
++This will create a file paxtest.log in the user's home directory.
+ 
+ 
+ Kiddie and blackhat mode:
+--- a/genpaxtest
++++ b/genpaxtest
+@@ -16,23 +16,32 @@
+ cat << __here__ > paxtest
+ #!/bin/sh
+ 
+-if [ \$# = 1 ]
++if [ \$# = 1 -o \$# = 2 ]
+ then
+ 	if [ "\$1" = "kiddie" ]
+ 	then
+ 		PAXTEST_MODE=0
++                shift
+ 	elif [ "\$1" = "blackhat" ]
+ 	then
+ 		PAXTEST_MODE=1
++                shift
+ 	else
+-		echo "usage: paxtest [kiddie|blackhat]"
++		echo "usage: paxtest [kiddie|blackhat] [logfile]"
+ 		exit 1
+ 	fi
+ else
+-	echo "usage: paxtest [kiddie|blackhat]"
++	echo "usage: paxtest [kiddie|blackhat] [logfile]"
+ 	exit 1
+ fi
+ 
++LOG=\$HOME/paxtest.log
++[ -n "\$1" ]  && LOG=\$1
++touch "\$LOG" 
++if [ ! -e "\$LOG" ] ; then
++    echo "Could not create logfile in \$LOG" >&2
++    exit 1
++fi
+ export PAXTEST_MODE
+ 
+ if [ "\${LD_LIBRARY_PATH}" = "" ]
+@@ -43,7 +52,7 @@
+ fi
+ export LD_LIBRARY_PATH
+ 
+-cat <<__end__ | tee paxtest.log
++cat <<__end__ | tee \$LOG
+ PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
+ Released under the GNU Public Licence version 2 or later
+ 
+@@ -53,16 +62,16 @@
+ uname -a >>paxtest.log
+ echo >>paxtest.log
+ 
+-echo 'Writing output to paxtest.log'
++echo 'Writing output to \$LOG'
+ echo 'It may take a while for the tests to complete'
+ 
+ for i in $*
+ do
+ 	${RUNDIR}/\$i
+-done >>paxtest.log 2>&1
++done >>\$LOG 2>&1
+ 
+ echo "Test results:"
+-cat paxtest.log
++cat \$LOG
+ 
+ echo
+ 
diff -Nru paxtest-0.9.11/debian/patches/03_paxtest_add_info.diff paxtest-0.9.14/debian/patches/03_paxtest_add_info.diff
--- paxtest-0.9.11/debian/patches/03_paxtest_add_info.diff	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/patches/03_paxtest_add_info.diff	2016-04-30 14:59:36.000000000 +0000
@@ -0,0 +1,44 @@
+Description: Add more information to paxtest log
+ Add more information to paxtest log file such
+ as the textual description of the mode and
+ the distribution information.
+Author: Javier Fernández-Sanguino Peña <jfs@debian.org>
+Forwarded: no
+Last-Update: <2016-04-30>
+
+
+
+--- a/genpaxtest
++++ b/genpaxtest
+@@ -58,13 +58,27 @@
+ 
+ __end__
+ 
+-echo "Mode: \$1" >>paxtest.log
+-uname -a >>paxtest.log
+-echo >>paxtest.log
++echo "Mode: \$PAXTEST_MODE" >>\$LOG
++if [ "\$PAXTEST_MODE" -eq 0 ] ; then
++    echo -n "Kiddie" >>\$LOG
++fi
++if [ "\$PAXTEST_MODE" -eq 1 ] ; then
++    echo -n "Blackhat" >>\$LOG
++fi
++echo >>\$LOG
+ 
+-echo 'Writing output to \$LOG'
++echo "Kernel: " >>\$LOG
++uname -a >>\$LOG
++echo >>\$LOG
++if [ -e /usr/bin/lsb_release ] ; then
++    echo "Relase information: " >>\$LOG
++    lsb_release -a 2>/dev/null >>\$LOG
++fi
++
++echo "Writing output to \$LOG"
+ echo 'It may take a while for the tests to complete'
+ 
++echo "Test results:" >>\$LOG
+ for i in $*
+ do
+ 	${RUNDIR}/\$i
diff -Nru paxtest-0.9.11/debian/patches/04_remove_void_function.diff paxtest-0.9.14/debian/patches/04_remove_void_function.diff
--- paxtest-0.9.11/debian/patches/04_remove_void_function.diff	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/patches/04_remove_void_function.diff	2016-04-30 15:08:55.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Fix FTBFS to build with clang
+ This patch relocates the dummy nested function
+ so that it is out of the main() block. This
+ makes it possible to build the program with clang
+ as it does not support this "feature".
+Author: Alexander <sanek23994@gmail.com>
+Forwarded: no
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758566
+Last-Update: <2014-08-18>
+
+
+--- ./body.c	2010-10-22 06:01:36.000000000 +0400
++++ ../paxtest-0.9.11-my/./body.c	2014-08-19 00:54:19.480193990 +0400
+@@ -26,6 +26,10 @@
+ 	return NULL;
+ }
+ 
++
++/* Dummy nested function */
++static void dummy(void) {}
++
+ int main( int argc, char *argv[] )
+ {
+ 	int status;
+@@ -36,9 +40,6 @@
+ 	 */
+ 	int paxtest_mode = 1;
+ 
+-	/* Dummy nested function */
+-	void dummy(void) {}
+-
+ 	mode = getenv( "PAXTEST_MODE" );
+ 	if( mode == NULL ) {
+ 		paxtest_mode = 1;
diff -Nru paxtest-0.9.11/debian/patches/series paxtest-0.9.14/debian/patches/series
--- paxtest-0.9.11/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/patches/series	2016-04-30 14:45:51.000000000 +0000
@@ -0,0 +1,3 @@
+01_add_results.diff
+02_change_log_file_location.diff
+03_paxtest_add_info.diff
diff -Nru paxtest-0.9.11/debian/paxtest.docs paxtest-0.9.14/debian/paxtest.docs
--- paxtest-0.9.11/debian/paxtest.docs	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/paxtest.docs	2016-04-30 15:03:43.000000000 +0000
@@ -0,0 +1 @@
+README
diff -Nru paxtest-0.9.11/debian/paxtest.examples paxtest-0.9.14/debian/paxtest.examples
--- paxtest-0.9.11/debian/paxtest.examples	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/paxtest.examples	2016-05-02 19:37:58.000000000 +0000
@@ -0,0 +1,12 @@
+results/README.results
+debian/sample.debian
+results/PaX_x86_64.blackhat 
+results/PaX_x86.blackhat
+results/Debian_sid_Linux_2_4_2007.blackhat
+results/Debian_sid_Linux_2_4_2007.kiddie
+results/Debian_sid_Linux_2_6_2010.blackhat
+results/Debian_sid_Linux_2_6_2010.kiddie
+results/Debian_sid_Linux_4_4_2016.blackhat
+results/Debian_sid_Linux_4_4_2016.kiddie
+results/Debian_sid_Linux_4_4_grsec_2016.blackhat
+results/Debian_sid_Linux_4_4_grsec_2016.kiddie
diff -Nru paxtest-0.9.11/debian/paxtest.manpages paxtest-0.9.14/debian/paxtest.manpages
--- paxtest-0.9.11/debian/paxtest.manpages	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/paxtest.manpages	2016-04-30 13:37:03.000000000 +0000
@@ -0,0 +1 @@
+paxtest.1
diff -Nru paxtest-0.9.11/debian/paxtest.sgml paxtest-0.9.14/debian/paxtest.sgml
--- paxtest-0.9.11/debian/paxtest.sgml	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/debian/paxtest.sgml	2016-04-30 13:44:30.000000000 +0000
@@ -120,7 +120,7 @@
     <title>OPTIONS</title>
 
     <para>This program can take two options: the tests to run, which 
-      are indicated using either <em>kiddie</em> or <em>blackhat</em>
+      are indicated using either <literal>kiddie</literal> or <literal>blackhat</literal>
       and (optionally) a file to which log all the test results. By default it
       will log to the user's HOME directory in a paxtest.log file.
     </para>
diff -Nru paxtest-0.9.11/debian/README.source paxtest-0.9.14/debian/README.source
--- paxtest-0.9.11/debian/README.source	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/README.source	2016-04-30 14:30:09.000000000 +0000
@@ -0,0 +1,5 @@
+    This package uses quilt to manage all modifications to the upstream source.
+    Changes are stored in the source package as diffs in debian/patches and
+    applied during the build.
+
+    See /usr/share/doc/quilt/README.source for a detailed explanation.
diff -Nru paxtest-0.9.11/debian/rules paxtest-0.9.14/debian/rules
--- paxtest-0.9.11/debian/rules	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/debian/rules	2016-04-30 14:40:57.000000000 +0000
@@ -27,15 +27,10 @@
 	INSTALL_PROGRAM += -s
 endif
 
-#configure: configure-stamp
-#configure-stamp:
-#	dh_testdir
-#	touch configure-stamp
+%:
+	dh $@ --with quilt
 
-build: build-stamp
-
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 ifeq ($(DEB_BUILD_ARCH), i386)
 	$(MAKE) -f Makefile linux32
 else	
@@ -47,47 +42,13 @@
 endif
 	/usr/bin/docbook-to-man debian/paxtest.sgml > paxtest.1
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) -f Makefile.psm clean
-	-rm -f paxtest.1
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) -f Makefile.psm install DESTDIR=$(CURDIR)/debian/paxtest
 
+override_dh_auto_clean:
+	dh_auto_clean
+	$(MAKE) -f Makefile.psm clean
+	rm -f paxtest.1 test
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples debian/sample.adamantix debian/sample.debian
-	dh_installmenu
-	dh_installman paxtest.1
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_install:
+	dh_install
+	$(MAKE) -f Makefile.psm install DESTDIR=$(CURDIR)/debian/paxtest
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff -Nru paxtest-0.9.11/debian/source/format paxtest-0.9.14/debian/source/format
--- paxtest-0.9.11/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/source/format	2016-04-30 14:39:40.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru paxtest-0.9.11/debian/watch paxtest-0.9.14/debian/watch
--- paxtest-0.9.11/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/debian/watch	2016-05-02 19:08:46.000000000 +0000
@@ -0,0 +1,3 @@
+version=3
+http://www.grsecurity.net/~spender/ \
+(?:|.*/)paxtest(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
diff -Nru paxtest-0.9.11/execbss.c paxtest-0.9.14/execbss.c
--- paxtest-0.9.11/execbss.c	2010-02-21 19:55:38.000000000 +0000
+++ paxtest-0.9.14/execbss.c	2015-09-29 12:20:26.000000000 +0000
@@ -18,7 +18,7 @@
 {
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)&buf;
diff -Nru paxtest-0.9.11/execdata.c paxtest-0.9.14/execdata.c
--- paxtest-0.9.11/execdata.c	2010-02-21 20:09:46.000000000 +0000
+++ paxtest-0.9.14/execdata.c	2015-09-29 12:20:26.000000000 +0000
@@ -12,13 +12,13 @@
 
 const char testname[] = "Executable data                          ";
 
-char buf[MAX_SHELLCODE_LEN] = SHELLCODE_RETURN_ARRAY;
+char buf[MAX_SHELLCODE_LEN] = { 'A' };
 
 void doit( void )
 {
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)&buf;
diff -Nru paxtest-0.9.11/execheap.c paxtest-0.9.14/execheap.c
--- paxtest-0.9.11/execheap.c	2010-02-21 21:15:32.000000000 +0000
+++ paxtest-0.9.14/execheap.c	2015-09-29 12:20:26.000000000 +0000
@@ -23,7 +23,7 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)buf;
diff -Nru paxtest-0.9.11/execstack.c paxtest-0.9.14/execstack.c
--- paxtest-0.9.11/execstack.c	2010-10-22 22:51:32.000000000 +0000
+++ paxtest-0.9.14/execstack.c	2015-09-29 12:20:26.000000000 +0000
@@ -14,10 +14,10 @@
 
 void doit( void )
 {
-	char buf[8192];
+	char buf[MAX_SHELLCODE_LEN];
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)buf;
diff -Nru paxtest-0.9.11/fastrandbody.c paxtest-0.9.14/fastrandbody.c
--- paxtest-0.9.11/fastrandbody.c	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/fastrandbody.c	2015-09-29 12:20:26.000000000 +0000
@@ -0,0 +1,63 @@
+/* fastrandbody.c - This part is shared by the randomization tests
+ *
+ * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
+ * This file has been released under the GNU Public Licence version 2 or later
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define COUNT	(25)
+
+extern const char testname[];
+extern const char testprog[];
+
+int main( int argc, char *argv[] )
+{
+	FILE *fp;
+	int i;
+	unsigned long tmp;
+	unsigned long and;
+	unsigned long or;
+	int bits;
+	int ret;
+
+	printf( "%s: ", testname );
+
+	and = ~0L;
+	or = 0L;
+	for( i = 0; i < COUNT; i++ ) {
+		fp = popen( testprog, "r" );
+		if( fp == NULL ) {
+			perror( testprog );
+			exit( 1 );
+		}
+
+		ret = fscanf( fp, "%lx", &tmp );
+		if (ret != 1) {
+			perror ( testprog );
+			exit( 1 );
+		}
+		and &= tmp;
+		or |= tmp;
+
+		pclose( fp );
+	}
+
+	if( and == or ) {
+		printf( "No randomization\n" );
+	} else {
+		tmp = and ^ ~or;
+		tmp = or & ~tmp;
+		bits = 0;
+		while( tmp != 0 ) {
+			bits += (tmp%2);
+			tmp >>= 1;
+		}
+
+		printf( "%d bits (guessed)\n", bits );
+	}
+
+	exit( 0 );
+}
+
diff -Nru paxtest-0.9.11/genpaxtest paxtest-0.9.14/genpaxtest
--- paxtest-0.9.11/genpaxtest	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/genpaxtest	2015-09-29 12:15:56.000000000 +0000
@@ -16,27 +16,23 @@
 cat << __here__ > paxtest
 #!/bin/sh
 
-if [ \$# = 1 -o \$# = 2 ]
+if [ \$# = 1 ]
 then
 	if [ "\$1" = "kiddie" ]
 	then
 		PAXTEST_MODE=0
-                shift
 	elif [ "\$1" = "blackhat" ]
 	then
 		PAXTEST_MODE=1
-                shift
 	else
-		echo "usage: paxtest [kiddie|blackhat] [logfile]"
+		echo "usage: paxtest [kiddie|blackhat]"
 		exit 1
 	fi
 else
-	echo "usage: paxtest [kiddie|blackhat] [logfile]"
+	echo "usage: paxtest [kiddie|blackhat]"
 	exit 1
 fi
 
-LOG=\$HOME/paxtest.log
-[ -n "\$1" ]  && LOG=\$1
 export PAXTEST_MODE
 
 if [ "\${LD_LIBRARY_PATH}" = "" ]
@@ -47,33 +43,26 @@
 fi
 export LD_LIBRARY_PATH
 
-cat <<__end__ | tee \$LOG
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
+cat <<__end__ | tee paxtest.log
+PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
 Released under the GNU Public Licence version 2 or later
 
 __end__
 
-echo -n "Mode: " >>\$LOG
-if [ "\$PAXTEST_MODE" -eq 0 ] ; then
-    echo -n "Kiddie" >>\$LOG
-fi
-if [ "\$PAXTEST_MODE" -eq 1 ] ; then
-    echo -n "Blackhat" >>\$LOG
-fi
-echo >>\$LOG
-uname -a >>\$LOG
-echo >>\$LOG
+echo "Mode: \$1" >>paxtest.log
+uname -a >>paxtest.log
+echo >>paxtest.log
 
-echo "Writing output to \$LOG"
+echo 'Writing output to paxtest.log'
 echo 'It may take a while for the tests to complete'
 
 for i in $*
 do
 	${RUNDIR}/\$i
-done >>\$LOG 2>&1
+done >>paxtest.log 2>&1
 
 echo "Test results:"
-cat \$LOG
+cat paxtest.log
 
 echo
 
Binary files /tmp/tmpr_Vez7/QvC2YBb7Hw/paxtest-0.9.11/getexhaust and /tmp/tmpr_Vez7/pkdGCptsfh/paxtest-0.9.14/getexhaust differ
diff -Nru paxtest-0.9.11/getexhaust1.c paxtest-0.9.14/getexhaust1.c
--- paxtest-0.9.11/getexhaust1.c	2013-02-01 04:18:52.000000000 +0000
+++ paxtest-0.9.14/getexhaust1.c	2015-09-29 12:20:26.000000000 +0000
@@ -15,7 +15,7 @@
 
 	while (1) {
 		addr = mmap(NULL, 0x1000, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-		if (addr == 0xffffffff)
+		if (addr == MAP_FAILED)
 			break;
 		last_addr = addr;
 	}
diff -Nru paxtest-0.9.11/getexhaust2.c paxtest-0.9.14/getexhaust2.c
--- paxtest-0.9.11/getexhaust2.c	2013-02-01 04:19:28.000000000 +0000
+++ paxtest-0.9.14/getexhaust2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <sys/mman.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 int main(void)
@@ -19,7 +20,7 @@
 
 	while (1) {
 		addr = mmap(NULL, 0x1000, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-		if (addr == 0xffffffff)
+		if (addr == MAP_FAILED)
 			break;
 		if (addr > (char *)&addr)
 			can_map_above_stack = 1;
@@ -33,7 +34,7 @@
 		while (1) {
 			munmap(maps[--num_maps], 0x1000);
 			addr = mmap(NULL, map_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-			if (addr == 0xffffffff)
+			if (addr == MAP_FAILED)
 				break;
 			munmap(addr, map_size);
 			map_size += 0x1000;
diff -Nru paxtest-0.9.11/getvdso.c paxtest-0.9.14/getvdso.c
--- paxtest-0.9.11/getvdso.c	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/getvdso.c	2015-09-29 12:20:26.000000000 +0000
@@ -0,0 +1,32 @@
+/* getshlib.c - Get the address of the maped VDSO  and print it
+ *
+ * Copyright (c) 2014 by Brad Spengler <spender@grsecurity.net>
+ * This file has been released under the GNU Public Licence version 2 or later
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main( int argc, char *argv[] )
+{
+	FILE *f = fopen("/proc/self/maps", "r");
+	char buf[1024] = { };
+	if (f == NULL)
+		return 0;
+
+	while (fgets(buf, sizeof(buf)-1, f)) {
+		if (strstr(buf, "[vdso]")) {
+			char *p = strchr(buf, '-');
+			unsigned long val;
+			*p = '\0';
+			val = strtoul(buf, NULL, 16);
+			printf("%p\n", val);
+			fclose(f);
+			return 0;
+		}
+	}
+	fclose(f);
+	return 0;
+}
diff -Nru paxtest-0.9.11/Makefile.psm paxtest-0.9.14/Makefile.psm
--- paxtest-0.9.11/Makefile.psm	2013-01-26 01:15:59.000000000 +0000
+++ paxtest-0.9.14/Makefile.psm	2015-09-29 12:37:10.000000000 +0000
@@ -77,13 +77,14 @@
 MPROT_TESTS = mprotanon mprotbss mprotdata mprotheap mprotstack
 SHLIB_TESTS = shlibbss shlibdata
 MPROTSH_TESTS = mprotshbss mprotshdata writetext
-RAND_TESTS = randamap randheap1 randheap2 randmain1 randmain2 randshlib randstack1 randstack2 randarg1 randarg2 randexhaust1 randexhaust2
+RAND_TESTS = randamap randheap1 randheap2 randmain1 randmain2 randshlib randvdso randstack1 randstack2 randarg1 randarg2
+FAST_RAND_TESTS = randexhaust1 randexhaust2
 RET_TESTS = rettofunc1 rettofunc2
 RETX_TESTS = rettofunc1x rettofunc2x
 
-TESTS = $(EXEC_TESTS) $(SHLIB_TESTS) $(MPROT_TESTS) $(MPROTSH_TESTS) $(RAND_TESTS) $(RET_TESTS) $(RETX_TESTS)
+TESTS = $(EXEC_TESTS) $(SHLIB_TESTS) $(MPROT_TESTS) $(MPROTSH_TESTS) $(RAND_TESTS) $(FAST_RAND_TESTS) $(RET_TESTS) $(RETX_TESTS)
 
-UTILS=	getamap getheap1 getheap2 getmain1 getmain2 getshlib getstack1 getstack2 getarg1 getarg2 getexhaust1 getexhaust2
+UTILS=	getamap getheap1 getheap2 getmain1 getmain2 getshlib getvdso getstack1 getstack2 getarg1 getarg2 getexhaust1 getexhaust2
 
 SHLIBS=	shlibtest.so shlibtest2.so
 
@@ -142,6 +143,10 @@
 	$(CC) $(CFLAGS) -o $@.o -c $@.c
 	$(CC) $(LDFLAGS) -o $@ $< $@.o
 
+$(FAST_RAND_TESTS): fastrandbody.o
+	$(CC) $(CFLAGS) -o $@.o -c $@.c
+	$(CC) $(LDFLAGS) -o $@ $< $@.o
+
 getamap: getamap.o
 	$(CC) $(LDFLAGS) -o $@ $@.o
 	
diff -Nru paxtest-0.9.11/mprotanon.c paxtest-0.9.14/mprotanon.c
--- paxtest-0.9.11/mprotanon.c	2010-02-21 20:11:39.000000000 +0000
+++ paxtest-0.9.14/mprotanon.c	2015-09-29 12:20:26.000000000 +0000
@@ -24,13 +24,13 @@
 	char *buf;
 	fptr func;
 
-	buf = mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+	buf = mmap(NULL, PAGE_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
 	if( buf == MAP_FAILED ) {
 		fprintf( stderr, "mmap() returned NULL\n" );
 		exit( 1 );
 	}
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)buf;
@@ -55,7 +55,7 @@
 	 * call than to fix your kernel and userland.
 	 */
 	/* Due to a FreeBSD bug PROT_READ is required */
-	do_mprotect( buf, 4096, PROT_READ|PROT_EXEC );
+	do_mprotect( buf, PAGE_SIZE_MAX, PROT_READ|PROT_EXEC );
 
 	/* Call the code in the buffer */
 	func();
diff -Nru paxtest-0.9.11/mprotbss.c paxtest-0.9.14/mprotbss.c
--- paxtest-0.9.11/mprotbss.c	2010-02-21 20:04:25.000000000 +0000
+++ paxtest-0.9.14/mprotbss.c	2015-09-29 12:20:26.000000000 +0000
@@ -14,13 +14,13 @@
 
 const char testname[] = "Executable bss (mprotect)                ";
 
-char buf[MAX_SHELLCODE_LEN];
+char buf[PAGE_SIZE_MAX] __pagealigned;
 
 void doit( void )
 {
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)&buf;
diff -Nru paxtest-0.9.11/mprotdata.c paxtest-0.9.14/mprotdata.c
--- paxtest-0.9.11/mprotdata.c	2010-02-21 20:11:08.000000000 +0000
+++ paxtest-0.9.14/mprotdata.c	2015-09-29 12:20:26.000000000 +0000
@@ -14,13 +14,13 @@
 
 const char testname[] = "Executable data (mprotect)               ";
 
-char buf[MAX_SHELLCODE_LEN] = SHELLCODE_RETURN_ARRAY;
+char buf[PAGE_SIZE_MAX] __pagealigned = { 'A' };
 
 void doit( void )
 {
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)&buf;
diff -Nru paxtest-0.9.11/mprotheap.c paxtest-0.9.14/mprotheap.c
--- paxtest-0.9.11/mprotheap.c	2010-02-21 20:12:24.000000000 +0000
+++ paxtest-0.9.14/mprotheap.c	2015-09-29 12:20:26.000000000 +0000
@@ -25,11 +25,11 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Try to make the buffer executable by using mprotect() */
 	/* Due to a FreeBSD bug PROT_READ is required */
-	do_mprotect( buf, SIZE_OF_SHELLCODE_RETURN, PROT_READ|PROT_EXEC );
+	do_mprotect( buf, MAX_SHELLCODE_LEN, PROT_READ|PROT_EXEC );
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)buf;
diff -Nru paxtest-0.9.11/mprotshbss.c paxtest-0.9.14/mprotshbss.c
--- paxtest-0.9.11/mprotshbss.c	2010-10-22 22:48:43.000000000 +0000
+++ paxtest-0.9.14/mprotshbss.c	2015-09-29 12:20:26.000000000 +0000
@@ -48,8 +48,8 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(shbss, SHELLCODE_RETURN);
-	copy_shellcode(shbss2, SHELLCODE_RETURN);
+	copy_shellcode(shbss);
+	copy_shellcode(shbss2);
 
 	/* Convert the pointer to a function pointer */
 	func = shbss < shbss2 ? (fptr)shbss : (fptr)shbss2;
diff -Nru paxtest-0.9.11/mprotshdata.c paxtest-0.9.14/mprotshdata.c
--- paxtest-0.9.11/mprotshdata.c	2010-02-21 21:41:03.000000000 +0000
+++ paxtest-0.9.14/mprotshdata.c	2015-09-29 12:20:26.000000000 +0000
@@ -47,8 +47,8 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(shdata, SHELLCODE_RETURN);
-	copy_shellcode(shdata2, SHELLCODE_RETURN);
+	copy_shellcode(shdata);
+	copy_shellcode(shdata2);
 
 	/* Convert the pointer to a function pointer */
 	func = shdata < shdata2 ? (fptr)shdata : (fptr)shdata2;
diff -Nru paxtest-0.9.11/mprotstack.c paxtest-0.9.14/mprotstack.c
--- paxtest-0.9.11/mprotstack.c	2010-02-21 20:14:34.000000000 +0000
+++ paxtest-0.9.14/mprotstack.c	2015-09-29 12:20:26.000000000 +0000
@@ -19,7 +19,7 @@
 	char buf[MAX_SHELLCODE_LEN];
 	fptr func;
 
-	copy_shellcode(buf, SHELLCODE_RETURN);
+	copy_shellcode(buf);
 
 	/* Convert the pointer to a function pointer */
 	func = (fptr)&buf;
diff -Nru paxtest-0.9.11/paxtest.h paxtest-0.9.14/paxtest.h
--- paxtest-0.9.11/paxtest.h	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/paxtest.h	2015-09-29 12:17:14.000000000 +0000
@@ -0,0 +1,27 @@
+#ifndef _PAXTEST_H_
+#define _PAXTEST_H_
+
+#include <string.h>
+
+#define PAGE_SIZE_MAX	0x10000	/* 64k should cover most arches */
+#define __aligned(x)	__attribute__((aligned(x)))
+#define __pagealigned	__aligned(PAGE_SIZE_MAX)
+#define __use(x)	asm volatile ( "" : : "m" (x) );
+
+static inline char *forced_strcpy(char *dst, const char *src)
+{
+	strcpy(dst, src);
+	/* ensure the compiler won't optimize the strcpy() away */
+	__use(dst);
+	return dst;
+}
+
+static inline void *forced_memcpy(void *dst, const void *src, size_t n)
+{
+	memcpy(dst, src, n);
+	/* ensure the compiler won't optimize the memcpy() away */
+	__use(dst);
+	return dst;
+}
+
+#endif
diff -Nru paxtest-0.9.11/randamap.c paxtest-0.9.14/randamap.c
--- paxtest-0.9.11/randamap.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randamap.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randamap.c - Tests the randomisation of anonymous mappings.
+/* randamap.c - Tests the randomization of anonymous mappings.
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Anonymous mapping randomisation test     ";
+const char testname[] = "Anonymous mapping randomization test     ";
 const char testprog[] = RUNDIR"/getamap";
diff -Nru paxtest-0.9.11/randarg1.c paxtest-0.9.14/randarg1.c
--- paxtest-0.9.11/randarg1.c	2012-03-10 05:26:28.000000000 +0000
+++ paxtest-0.9.14/randarg1.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randarg.c - Tests the randomisation of arguments/environment
+/* randarg.c - Tests the randomization of arguments/environment
  * 
  */
 
@@ -6,5 +6,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Arg/env randomisation test (SEGMEXEC)    ";
+const char testname[] = "Arg/env randomization test (SEGMEXEC)    ";
 const char testprog[] = RUNDIR"/getarg1";
diff -Nru paxtest-0.9.11/randarg2.c paxtest-0.9.14/randarg2.c
--- paxtest-0.9.11/randarg2.c	2012-03-10 05:26:34.000000000 +0000
+++ paxtest-0.9.14/randarg2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randarg.c - Tests the randomisation of arguments/environment
+/* randarg.c - Tests the randomization of arguments/environment
  * 
  */
 
@@ -6,5 +6,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Arg/env randomisation test (PAGEEXEC)    ";
+const char testname[] = "Arg/env randomization test (PAGEEXEC)    ";
 const char testprog[] = RUNDIR"/getarg2";
diff -Nru paxtest-0.9.11/randbody.c paxtest-0.9.14/randbody.c
--- paxtest-0.9.11/randbody.c	2009-09-10 23:00:05.000000000 +0000
+++ paxtest-0.9.14/randbody.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,13 +1,13 @@
-/* randbody.c - This part is shared by the randomisation tests
+/* randbody.c - This part is shared by the randomization tests
  *
- * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
+ * Copyright (c)2003-2014 by Peter Busser <peter@adamantix.org>, Brad Spengler <spender@grsecurity.net>
  * This file has been released under the GNU Public Licence version 2 or later
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#define COUNT	(25)
+#define COUNT	(1500)
 
 extern const char testname[];
 extern const char testprog[];
@@ -15,7 +15,11 @@
 int main( int argc, char *argv[] )
 {
 	FILE *fp;
-	int i;
+	int i, x;
+	unsigned long results[COUNT];
+	unsigned int quality[8 * sizeof(unsigned long)] = { 0 };
+	unsigned int weak_bits = 0;
+	unsigned int dupes = 0;
 	unsigned long tmp;
 	unsigned long and;
 	unsigned long or;
@@ -38,6 +42,7 @@
 			perror ( testprog );
 			exit( 1 );
 		}
+		results[i] = tmp;
 		and &= tmp;
 		or |= tmp;
 
@@ -45,17 +50,27 @@
 	}
 
 	if( and == or ) {
-		printf( "No randomisation\n" );
+		printf( "No randomization\n" );
 	} else {
 		tmp = and ^ ~or;
 		tmp = or & ~tmp;
 		bits = 0;
+		for (i = 0; i < sizeof(quality)/sizeof(quality[0]); i++) {
+			if (!(tmp & (1UL << i)))
+				continue;
+			for (x = 0; x < COUNT; x++) {
+				if (results[x] & (1UL << i))
+					quality[i] += 1;
+			}
+			if (quality[i] <= ((COUNT * 35) / 100) || quality[i] >= ((COUNT * 65) / 100))
+				weak_bits++;
+		}
 		while( tmp != 0 ) {
 			bits += (tmp%2);
 			tmp >>= 1;
 		}
 
-		printf( "%d bits (guessed)\n", bits );
+		printf( "%d quality bits (guessed)\n", bits - weak_bits);
 	}
 
 	exit( 0 );
Binary files /tmp/tmpr_Vez7/QvC2YBb7Hw/paxtest-0.9.11/randexhaust and /tmp/tmpr_Vez7/pkdGCptsfh/paxtest-0.9.14/randexhaust differ
diff -Nru paxtest-0.9.11/randexhaust2.c paxtest-0.9.14/randexhaust2.c
--- paxtest-0.9.11/randexhaust2.c	2013-01-26 01:31:38.000000000 +0000
+++ paxtest-0.9.14/randexhaust2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randexhaust2.c - Tests the randomisation under memory exhaustion
+/* randexhaust2.c - Tests the randomization under memory exhaustion
  * when trying to get a fixed address at the bottom of the address space
  */
 
diff -Nru paxtest-0.9.11/randheap1.c paxtest-0.9.14/randheap1.c
--- paxtest-0.9.11/randheap1.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randheap1.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randheap1.c - Tests the randomisation of the heap of ET_EXEC main executable.
+/* randheap1.c - Tests the randomization of the heap of ET_EXEC main executable.
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Heap randomisation test (ET_EXEC)        ";
+const char testname[] = "Heap randomization test (ET_EXEC)        ";
 const char testprog[] = RUNDIR"/getheap1";
diff -Nru paxtest-0.9.11/randheap2.c paxtest-0.9.14/randheap2.c
--- paxtest-0.9.11/randheap2.c	2010-02-12 23:59:12.000000000 +0000
+++ paxtest-0.9.14/randheap2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randheap2.c - Tests the randomisation of the heap of PIE main executable.
+/* randheap2.c - Tests the randomization of the heap of PIE main executable.
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Heap randomisation test (PIE)            ";
+const char testname[] = "Heap randomization test (PIE)            ";
 const char testprog[] = RUNDIR"/getheap2";
diff -Nru paxtest-0.9.11/randmain1.c paxtest-0.9.14/randmain1.c
--- paxtest-0.9.11/randmain1.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randmain1.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randmain1.c - Tests the randomisation of ET_EXEC main executable
+/* randmain1.c - Tests the randomization of ET_EXEC main executable
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Main executable randomisation (ET_EXEC)  ";
+const char testname[] = "Main executable randomization (ET_EXEC)  ";
 const char testprog[] = RUNDIR"/getmain1";
diff -Nru paxtest-0.9.11/randmain2.c paxtest-0.9.14/randmain2.c
--- paxtest-0.9.11/randmain2.c	2010-02-12 23:59:56.000000000 +0000
+++ paxtest-0.9.14/randmain2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randmain2.c - Tests the randomisation of the ET_DYN main executable
+/* randmain2.c - Tests the randomization of the ET_DYN main executable
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Main executable randomisation (PIE)      ";
+const char testname[] = "Main executable randomization (PIE)      ";
 const char testprog[] = RUNDIR"/getmain2";
diff -Nru paxtest-0.9.11/randshlib.c paxtest-0.9.14/randshlib.c
--- paxtest-0.9.11/randshlib.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randshlib.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randshlib.c - Tests the randomisation of shared library loading
+/* randshlib.c - Tests the randomization of shared library loading
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Shared library randomisation test        ";
+const char testname[] = "Shared library randomization test        ";
 const char testprog[] = RUNDIR"/getshlib";
diff -Nru paxtest-0.9.11/randstack1.c paxtest-0.9.14/randstack1.c
--- paxtest-0.9.11/randstack1.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randstack1.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randstack.c - Tests the randomisation of the stack pointer.
+/* randstack.c - Tests the randomization of the stack pointer.
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Stack randomisation test (SEGMEXEC)      ";
+const char testname[] = "Stack randomization test (SEGMEXEC)      ";
 const char testprog[] = RUNDIR"/getstack1";
diff -Nru paxtest-0.9.11/randstack2.c paxtest-0.9.14/randstack2.c
--- paxtest-0.9.11/randstack2.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/randstack2.c	2015-09-29 12:20:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* randstack.c - Tests the randomisation of the stack pointer.
+/* randstack.c - Tests the randomization of the stack pointer.
  * 
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
@@ -8,5 +8,5 @@
 #error RUNDIR not defined
 #endif
 
-const char testname[] = "Stack randomisation test (PAGEEXEC)      ";
+const char testname[] = "Stack randomization test (PAGEEXEC)      ";
 const char testprog[] = RUNDIR"/getstack2";
diff -Nru paxtest-0.9.11/randvdso.c paxtest-0.9.14/randvdso.c
--- paxtest-0.9.11/randvdso.c	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/randvdso.c	2015-09-29 12:20:26.000000000 +0000
@@ -0,0 +1,12 @@
+/* randvdso.c - Tests the randomization of VDSO
+ * 
+ * Copyright (c) 2014 by Brad Spengler <spender@grsecurity.net>
+ * This file has been released under the GNU Public Licence version 2 or later
+ */
+
+#ifndef RUNDIR
+#error RUNDIR not defined
+#endif
+
+const char testname[] = "VDSO randomization test                  ";
+const char testprog[] = RUNDIR"/getvdso";
diff -Nru paxtest-0.9.11/README paxtest-0.9.14/README
--- paxtest-0.9.11/README	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/README	2015-09-29 12:20:36.000000000 +0000
@@ -1,8 +1,8 @@
-Paxtest v0.9.10 README file
+Paxtest v0.9.13 README file
 
 Copyright (c)2004 by Peter Busser <peter@adamantix.org>
 
-Additional architecture/target support & fixes
+Additional architecture/target support, tests, & fixes
 by Brad Spengler <spender@grsecurity.net>
 
 This file has been released under the GNU GPL version 2 or later.
@@ -50,7 +50,7 @@
 
 ./paxtest blackhat	(to run paxtest in blackhat mode)
 
-This will create a file paxtest.log in the user's home directory.
+This will create a file paxtest.log in the current directory.
 
 
 Kiddie and blackhat mode:
@@ -80,14 +80,14 @@
 some people claim that normal applicatons do not do this - indeed, but that
 is not what these tests are about, they simulate exploits, not applications.
 
-Second, there is a number of tests that measure the randomisation of the
+Second, there is a number of tests that measure the randomization of the
 system. Randomisation does not provide any security, but only makes it harder
 for the attacker to guess where to attack (it is in fact security through
 obscurity). It is like rearranging the furniture in a pitch dark room every
 time someone enters. The more random the furniture is placed, the more likely
-it is that someone stumbles over it. The same applies to randomisation in this
-context, randomisation makes it more likely that an attack does not succeed.
-In short: More random bits is better. Zero bits means: No randomisation.
+it is that someone stumbles over it. The same applies to randomization in this
+context, randomization makes it more likely that an attack does not succeed.
+In short: More random bits is better. Zero bits means: No randomization.
 
 
 Executable anonymous mapping
@@ -119,41 +119,41 @@
 	Again, these tests try to switch off the memory protection using
 	mprotect().
 
-Anonymous mapping randomisation test
+Anonymous mapping randomization test
 
 	Anonymous mappings are used for dynamically allocating memory in a
 	program. This test tries to figure out the number of random bits used
 	when such an anonymous mapping is requested. More bits is better.
 
-Heap randomisation test (ET_EXEC)
-Heap randomisation test (ET_DYN)
+Heap randomization test (ET_EXEC)
+Heap randomization test (ET_DYN)
 
 	The heap is used for allocating small chunks of memory in a program.
 	There there are two different types of executables, ET_EXEC (normal
 	executables) and ET_DYN (basically executable shared libraries). The
-	randomisation can depend on the kind of executable, therefore there
+	randomization can depend on the kind of executable, therefore there
 	are two tests.
 
 	Most Linux distributions ship with ET_EXEC executables only. So for
-	those the ET_EXEC randomisation is the most relevant. Adamantix ships
-	with mostly ET_DYN executables, so the ET_EXEC randomisation is not
-	very relevant, but the ET_DYN randomisation is.
+	those the ET_EXEC randomization is the most relevant. Adamantix ships
+	with mostly ET_DYN executables, so the ET_EXEC randomization is not
+	very relevant, but the ET_DYN randomization is.
 
-	Normally ET_DYN randomisation is bigger than the ET_EXEC randomisation.
+	Normally ET_DYN randomization is bigger than the ET_EXEC randomisation.
 
-Main executable randomisation (ET_EXEC)
-Main executable randomisation (ET_DYN)
+Main executable randomization (ET_EXEC)
+Main executable randomization (ET_DYN)
 
 	Same here, two tests, because the two different types of executables
-	can have different randomisation.
+	can have different randomization.
 
-Shared library randomisation test
+Shared library randomization test
 
 	Shared libraries can be located at random addresses too, which is what
 	this test tries to find out.
 
-Stack randomisation test (SEGMEXEC)
-Stack randomisation test (PAGEEXEC)
+Stack randomization test (SEGMEXEC)
+Stack randomization test (PAGEEXEC)
 
 	The stack is used for storing intermediate data. It also contains
 	addresses that influence the way programs run. That combination makes
diff -Nru paxtest-0.9.11/results/Adamantix.blackhat paxtest-0.9.14/results/Adamantix.blackhat
--- paxtest-0.9.11/results/Adamantix.blackhat	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/results/Adamantix.blackhat	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: blackhat
-Linux devbox 2.4.22-1-k7-sec #1 Mon Jan 26 02:12:39 CET 2004 i686 unknown
-
-Executable anonymous mapping             : Killed
-Executable bss                           : Killed
-Executable data                          : Killed
-Executable heap                          : Killed
-Executable stack                         : Killed
-Executable anonymous mapping (mprotect)  : Killed
-Executable bss (mprotect)                : Killed
-Executable data (mprotect)               : Killed
-Executable heap (mprotect)               : Killed
-Executable shared library bss (mprotect) : Killed
-Executable shared library data (mprotect): Killed
-Executable stack (mprotect)              : Killed
-Anonymous mapping randomisation test     : 16 bits (guessed)
-Heap randomisation test (ET_EXEC)        : 25 bits (guessed)
-Heap randomisation test (ET_DYN)         : 25 bits (guessed)
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (ET_DYN)   : 17 bits (guessed)
-Shared library randomisation test        : 16 bits (guessed)
-Stack randomisation test (SEGMEXEC)      : 23 bits (guessed)
-Stack randomisation test (PAGEEXEC)      : 24 bits (guessed)
-Return to function (strcpy)              : Vulnerable
-Return to function (strcpy, RANDEXEC)    : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (memcpy, RANDEXEC)    : Vulnerable
-Executable shared library bss            : Killed
-Executable shared library data           : Killed
-Writable text segments                   : Killed
diff -Nru paxtest-0.9.11/results/Adamantix.kiddie paxtest-0.9.14/results/Adamantix.kiddie
--- paxtest-0.9.11/results/Adamantix.kiddie	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/results/Adamantix.kiddie	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: kiddie
-Linux devbox 2.4.22-1-k7-sec #1 Mon Jan 26 02:12:39 CET 2004 i686 unknown
-
-Executable anonymous mapping             : Killed
-Executable bss                           : Killed
-Executable data                          : Killed
-Executable heap                          : Killed
-Executable stack                         : Killed
-Executable anonymous mapping (mprotect)  : Killed
-Executable bss (mprotect)                : Killed
-Executable data (mprotect)               : Killed
-Executable heap (mprotect)               : Killed
-Executable shared library bss (mprotect) : Killed
-Executable shared library data (mprotect): Killed
-Executable stack (mprotect)              : Killed
-Anonymous mapping randomisation test     : 16 bits (guessed)
-Heap randomisation test (ET_EXEC)        : 25 bits (guessed)
-Heap randomisation test (ET_DYN)         : 25 bits (guessed)
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (ET_DYN)   : 17 bits (guessed)
-Shared library randomisation test        : 16 bits (guessed)
-Stack randomisation test (SEGMEXEC)      : 23 bits (guessed)
-Stack randomisation test (PAGEEXEC)      : 24 bits (guessed)
-Return to function (strcpy)              : Vulnerable
-Return to function (strcpy, RANDEXEC)    : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (memcpy, RANDEXEC)    : Vulnerable
-Executable shared library bss            : Killed
-Executable shared library data           : Killed
-Writable text segments                   : Killed
diff -Nru paxtest-0.9.11/results/Debian-2007.blackhat paxtest-0.9.14/results/Debian-2007.blackhat
--- paxtest-0.9.11/results/Debian-2007.blackhat	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/results/Debian-2007.blackhat	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: blackhat
-Linux silicio 2.4.25-1-686 #1 Tue Feb 24 10:55:59 EST 2004 i686 GNU/Linux
-
-Executable anonymous mapping             : Vulnerable
-Executable bss                           : Vulnerable
-Executable data                          : Vulnerable
-Executable heap                          : Vulnerable
-Executable stack                         : Vulnerable
-Executable anonymous mapping (mprotect)  : Vulnerable
-Executable bss (mprotect)                : Vulnerable
-Executable data (mprotect)               : Vulnerable
-Executable heap (mprotect)               : Vulnerable
-Executable shared library bss (mprotect) : Vulnerable
-Executable shared library data (mprotect): Vulnerable
-Executable stack (mprotect)              : Vulnerable
-Anonymous mapping randomisation test     : No randomisation
-Heap randomisation test (ET_EXEC)        : No randomisation
-Heap randomisation test (ET_DYN)         : No randomisation
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (ET_DYN)   : No randomisation
-Shared library randomisation test        : No randomisation
-Stack randomisation test (SEGMEXEC)      : No randomisation
-Stack randomisation test (PAGEEXEC)      : No randomisation
-Return to function (strcpy)              : Vulnerable
-Return to function (strcpy, RANDEXEC)    : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (memcpy, RANDEXEC)    : Vulnerable
-Executable shared library bss            : Vulnerable
-Executable shared library data           : Vulnerable
-Writable text segments                   : Vulnerable
diff -Nru paxtest-0.9.11/results/Debian-2007.kiddie paxtest-0.9.14/results/Debian-2007.kiddie
--- paxtest-0.9.11/results/Debian-2007.kiddie	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/results/Debian-2007.kiddie	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: kiddie
-Linux silicio 2.4.25-1-686 #1 Tue Feb 24 10:55:59 EST 2004 i686 GNU/Linux
-
-Executable anonymous mapping             : Vulnerable
-Executable bss                           : Vulnerable
-Executable data                          : Vulnerable
-Executable heap                          : Vulnerable
-Executable stack                         : Vulnerable
-Executable anonymous mapping (mprotect)  : Vulnerable
-Executable bss (mprotect)                : Vulnerable
-Executable data (mprotect)               : Vulnerable
-Executable heap (mprotect)               : Vulnerable
-Executable shared library bss (mprotect) : Vulnerable
-Executable shared library data (mprotect): Vulnerable
-Executable stack (mprotect)              : Vulnerable
-Anonymous mapping randomisation test     : No randomisation
-Heap randomisation test (ET_EXEC)        : No randomisation
-Heap randomisation test (ET_DYN)         : No randomisation
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (ET_DYN)   : No randomisation
-Shared library randomisation test        : No randomisation
-Stack randomisation test (SEGMEXEC)      : No randomisation
-Stack randomisation test (PAGEEXEC)      : No randomisation
-Return to function (strcpy)              : Vulnerable
-Return to function (strcpy, RANDEXEC)    : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (memcpy, RANDEXEC)    : Vulnerable
-Executable shared library bss            : Vulnerable
-Executable shared library data           : Vulnerable
-Writable text segments                   : Vulnerable
diff -Nru paxtest-0.9.11/results/Debian.blackhat paxtest-0.9.14/results/Debian.blackhat
--- paxtest-0.9.11/results/Debian.blackhat	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/results/Debian.blackhat	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: 
-Linux silicio 2.6.32-5-686 #1 SMP Sat Sep 18 02:14:45 UTC 2010 i686 GNU/Linux
-
-Executable anonymous mapping             : Vulnerable
-Executable bss                           : Vulnerable
-Executable data                          : Vulnerable
-Executable heap                          : Vulnerable
-Executable stack                         : Vulnerable
-Executable shared library bss            : Vulnerable
-Executable shared library data           : Vulnerable
-Executable anonymous mapping (mprotect)  : Vulnerable
-Executable bss (mprotect)                : Vulnerable
-Executable data (mprotect)               : Vulnerable
-Executable heap (mprotect)               : Vulnerable
-Executable stack (mprotect)              : Vulnerable
-Executable shared library bss (mprotect) : Vulnerable
-Executable shared library data (mprotect): Vulnerable
-Writable text segments                   : Vulnerable
-Anonymous mapping randomisation test     : 12 bits (guessed)
-Heap randomisation test (ET_EXEC)        : 13 bits (guessed)
-Heap randomisation test (PIE)            : 16 bits (guessed)
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (PIE)      : 12 bits (guessed)
-Shared library randomisation test        : 10 bits (guessed)
-Stack randomisation test (SEGMEXEC)      : 19 bits (guessed)
-Stack randomisation test (PAGEEXEC)      : 19 bits (guessed)
-Return to function (strcpy)              : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (strcpy, PIE)         : Vulnerable
-Return to function (memcpy, PIE)         : Vulnerable
diff -Nru paxtest-0.9.11/results/Debian.kiddie paxtest-0.9.14/results/Debian.kiddie
--- paxtest-0.9.11/results/Debian.kiddie	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/results/Debian.kiddie	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: 
-Linux silicio 2.6.32-5-686 #1 SMP Sat Sep 18 02:14:45 UTC 2010 i686 GNU/Linux
-
-Executable anonymous mapping             : Vulnerable
-Executable bss                           : Vulnerable
-Executable data                          : Vulnerable
-Executable heap                          : Vulnerable
-Executable stack                         : Vulnerable
-Executable shared library bss            : Vulnerable
-Executable shared library data           : Vulnerable
-Executable anonymous mapping (mprotect)  : Vulnerable
-Executable bss (mprotect)                : Vulnerable
-Executable data (mprotect)               : Vulnerable
-Executable heap (mprotect)               : Vulnerable
-Executable stack (mprotect)              : Vulnerable
-Executable shared library bss (mprotect) : Vulnerable
-Executable shared library data (mprotect): Vulnerable
-Writable text segments                   : Vulnerable
-Anonymous mapping randomisation test     : 12 bits (guessed)
-Heap randomisation test (ET_EXEC)        : 14 bits (guessed)
-Heap randomisation test (PIE)            : 16 bits (guessed)
-Main executable randomisation (ET_EXEC)  : No randomisation
-Main executable randomisation (PIE)      : 12 bits (guessed)
-Shared library randomisation test        : 10 bits (guessed)
-Stack randomisation test (SEGMEXEC)      : 19 bits (guessed)
-Stack randomisation test (PAGEEXEC)      : 19 bits (guessed)
-Return to function (strcpy)              : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (strcpy, PIE)         : Vulnerable
-Return to function (memcpy, PIE)         : Vulnerable
diff -Nru paxtest-0.9.11/results/Gentoo.blackhat paxtest-0.9.14/results/Gentoo.blackhat
--- paxtest-0.9.11/results/Gentoo.blackhat	2004-03-05 11:50:42.000000000 +0000
+++ paxtest-0.9.14/results/Gentoo.blackhat	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: blackhat
-Linux simple 2.4.24-grsec-1.9.13 #3 Wed Jan 14 00:48:25 EST 2004 i686 Intel(R) Pentium(R) 4 CPU 1400MHz GenuineIntel GNU/Linux
-
-Executable anonymous mapping             : Killed
-Executable bss                           : Killed
-Executable data                          : Killed
-Executable heap                          : Killed
-Executable stack                         : Killed
-Executable anonymous mapping (mprotect)  : Killed
-Executable bss (mprotect)                : Killed
-Executable data (mprotect)               : Killed
-Executable heap (mprotect)               : Killed
-Executable stack (mprotect)              : Killed
-Executable shared library bss (mprotect) : Killed
-Executable shared library data (mprotect): Killed
-Writable text segments                   : Killed
-Anonymous mapping randomisation test     : 16 bits (guessed)
-Heap randomisation test (ET_EXEC)        : 13 bits (guessed)
-Heap randomisation test (ET_DYN)         : 25 bits (guessed)
-Main executable randomisation (ET_EXEC)  : 16 bits (guessed)
-Main executable randomisation (ET_DYN)   : 17 bits (guessed)
-Shared library randomisation test        : 16 bits (guessed)
-Stack randomisation test (SEGMEXEC)      : 23 bits (guessed)
-Stack randomisation test (PAGEEXEC)      : 24 bits (guessed)
-Return to function (strcpy)              : Vulnerable
-Return to function (memcpy)              : Vulnerable
-Return to function (strcpy, RANDEXEC)    : Killed
-Return to function (memcpy, RANDEXEC)    : Killed
-Executable shared library bss            : Killed
-Executable shared library data           : Killed
diff -Nru paxtest-0.9.11/results/PaX_x86_64.blackhat paxtest-0.9.14/results/PaX_x86_64.blackhat
--- paxtest-0.9.11/results/PaX_x86_64.blackhat	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/results/PaX_x86_64.blackhat	2015-09-29 12:24:08.000000000 +0000
@@ -0,0 +1,38 @@
+PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
+Released under the GNU Public Licence version 2 or later
+
+Mode: blackhat
+Linux debian 4.1.3-grsec+ #2 SMP PREEMPT Sun Jul 26 19:22:38 EDT 2015 x86_64 GNU/Linux
+
+Executable anonymous mapping             : Killed
+Executable bss                           : Killed
+Executable data                          : Killed
+Executable heap                          : Killed
+Executable stack                         : Killed
+Executable shared library bss            : Killed
+Executable shared library data           : Killed
+Executable anonymous mapping (mprotect)  : Killed
+Executable bss (mprotect)                : Killed
+Executable data (mprotect)               : Killed
+Executable heap (mprotect)               : Killed
+Executable stack (mprotect)              : Killed
+Executable shared library bss (mprotect) : Killed
+Executable shared library data (mprotect): Killed
+Writable text segments                   : Killed
+Anonymous mapping randomization test     : 28 quality bits (guessed)
+Heap randomization test (ET_EXEC)        : 22 quality bits (guessed)
+Heap randomization test (PIE)            : 35 quality bits (guessed)
+Main executable randomization (ET_EXEC)  : No randomization
+Main executable randomization (PIE)      : 27 quality bits (guessed)
+Shared library randomization test        : 28 quality bits (guessed)
+VDSO randomization test                  : 28 quality bits (guessed)
+Stack randomization test (SEGMEXEC)      : 35 quality bits (guessed)
+Stack randomization test (PAGEEXEC)      : 35 quality bits (guessed)
+Arg/env randomization test (SEGMEXEC)    : 39 quality bits (guessed)
+Arg/env randomization test (PAGEEXEC)    : 39 quality bits (guessed)
+Randomization under memory exhaustion @~0: 28 bits (guessed)
+Randomization under memory exhaustion @0 : 28 bits (guessed)
+Return to function (strcpy)              : paxtest: return address contains a NULL byte.
+Return to function (memcpy)              : Vulnerable
+Return to function (strcpy, PIE)         : paxtest: return address contains a NULL byte.
+Return to function (memcpy, PIE)         : Vulnerable
diff -Nru paxtest-0.9.11/results/PaX_x86.blackhat paxtest-0.9.14/results/PaX_x86.blackhat
--- paxtest-0.9.11/results/PaX_x86.blackhat	1970-01-01 00:00:00.000000000 +0000
+++ paxtest-0.9.14/results/PaX_x86.blackhat	2015-09-29 12:27:26.000000000 +0000
@@ -0,0 +1,38 @@
+PaXtest - Copyright(c) 2003-2014 by Peter Busser <peter@adamantix.org> and Brad Spengler <spender@grsecurity.net>
+Released under the GNU Public Licence version 2 or later
+
+Mode: blackhat
+Linux debian 4.1.3-grsec+ #2 SMP PREEMPT Sun Jul 26 19:22:38 EDT 2015 x86_64 GNU/Linux
+
+Executable anonymous mapping             : Killed
+Executable bss                           : Killed
+Executable data                          : Killed
+Executable heap                          : Killed
+Executable stack                         : Killed
+Executable shared library bss            : Killed
+Executable shared library data           : Killed
+Executable anonymous mapping (mprotect)  : Killed
+Executable bss (mprotect)                : Killed
+Executable data (mprotect)               : Killed
+Executable heap (mprotect)               : Killed
+Executable stack (mprotect)              : Killed
+Executable shared library bss (mprotect) : Killed
+Executable shared library data (mprotect): Killed
+Writable text segments                   : Killed
+Anonymous mapping randomization test     : 16 quality bits (guessed)
+Heap randomization test (ET_EXEC)        : 22 quality bits (guessed)
+Heap randomization test (PIE)            : 24 quality bits (guessed)
+Main executable randomization (ET_EXEC)  : No randomization
+Main executable randomization (PIE)      : 16 quality bits (guessed)
+Shared library randomization test        : 16 quality bits (guessed)
+VDSO randomization test                  : 16 quality bits (guessed)
+Stack randomization test (SEGMEXEC)      : 24 quality bits (guessed)
+Stack randomization test (PAGEEXEC)      : 24 quality bits (guessed)
+Arg/env randomization test (SEGMEXEC)    : 28 quality bits (guessed)
+Arg/env randomization test (PAGEEXEC)    : 28 quality bits (guessed)
+Randomization under memory exhaustion @~0: 16 bits (guessed)
+Randomization under memory exhaustion @0 : 8 bits (guessed)
+Return to function (strcpy)              : Vulnerable
+Return to function (memcpy)              : Vulnerable
+Return to function (strcpy, PIE)         : Vulnerable
+Return to function (memcpy, PIE)         : Vulnerable
diff -Nru paxtest-0.9.11/results/Results.README paxtest-0.9.14/results/Results.README
--- paxtest-0.9.11/results/Results.README	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/results/Results.README	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-The Adamantix paxtest results are generated by running paxtest on a default
-kernel configuration. The Adamantix default configuration does not enable
-randomisation of normal executables (the so called ET_EXEC files), because
-it costs performance and there are only a few executables of this type anyway.
-
-The Gentoo results show what is possible when a kernel is configured by hand
-and all PaX features are enabled (there is no default kernel configuration in
-Gentoo, or so the Gentoo developers say). It includes ET_EXEC randomisation,
-which also prevents certain return to function attacks.
-
-The Debian results are run in a stock Debian kernel with no stack-protection
-features at all (notice there are PaX and exec-shield are available in 
-separate patch packages for the kernel)
diff -Nru paxtest-0.9.11/rettofunc1.c paxtest-0.9.14/rettofunc1.c
--- paxtest-0.9.11/rettofunc1.c	2010-02-20 14:31:20.000000000 +0000
+++ paxtest-0.9.14/rettofunc1.c	2015-09-29 12:20:26.000000000 +0000
@@ -8,10 +8,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "body.h"
+#include "paxtest.h"
 
 const char testname[] = "Return to function (strcpy)              ";
 
-fptr overflow[32] = {
+static const fptr overflow[32] = {
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
@@ -20,10 +21,10 @@
 
 void doit( void )
 {
-	char buf[4];
+	char buf[sizeof(unsigned long)];
 
 	if (strlen((const char *)overflow) > sizeof(overflow[0])) {
-		strcpy( buf, (const char *)overflow );
+		forced_strcpy( buf, (const char *)overflow );
 	} else {
 		fprintf( stderr, "paxtest: return address contains a NULL byte.\n" );
 		exit(1);
diff -Nru paxtest-0.9.11/rettofunc1x.c paxtest-0.9.14/rettofunc1x.c
--- paxtest-0.9.11/rettofunc1x.c	2010-02-21 20:34:52.000000000 +0000
+++ paxtest-0.9.14/rettofunc1x.c	2015-09-29 12:20:26.000000000 +0000
@@ -8,10 +8,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "body.h"
+#include "paxtest.h"
 
 const char testname[] = "Return to function (strcpy, PIE)         ";
 
-fptr overflow[32] = {
+static const fptr overflow[32] = {
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
@@ -20,10 +21,10 @@
 
 void doit( void )
 {
-	char buf[4];
+	char buf[sizeof(unsigned long)];
 
 	if (strlen((const char *)overflow) > sizeof(overflow[0])) {
-		strcpy( buf, (const char *)overflow );
+		forced_strcpy( buf, (const char *)overflow );
 	} else {
 		fprintf( stderr, "paxtest: return address contains a NULL byte.\n" );
 		exit(1);
diff -Nru paxtest-0.9.11/rettofunc2.c paxtest-0.9.14/rettofunc2.c
--- paxtest-0.9.11/rettofunc2.c	2009-09-10 22:58:29.000000000 +0000
+++ paxtest-0.9.14/rettofunc2.c	2015-09-29 12:20:26.000000000 +0000
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <string.h>
 #include "body.h"
+#include "paxtest.h"
 
 const char testname[] = "Return to function (memcpy)              ";
 
-fptr overflow[32] = {
+static const fptr overflow[32] = {
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
@@ -19,7 +20,7 @@
 
 void doit( void )
 {
-	char buf[4];
+	char buf[sizeof(unsigned long)];
 
-	memcpy( buf, overflow, sizeof( overflow ) );
+	forced_memcpy( buf, overflow, sizeof( overflow ) );
 }
diff -Nru paxtest-0.9.11/rettofunc2x.c paxtest-0.9.14/rettofunc2x.c
--- paxtest-0.9.11/rettofunc2x.c	2010-02-21 20:35:05.000000000 +0000
+++ paxtest-0.9.14/rettofunc2x.c	2015-09-29 12:20:26.000000000 +0000
@@ -7,10 +7,11 @@
 #include <stdio.h>
 #include <string.h>
 #include "body.h"
+#include "paxtest.h"
 
 const char testname[] = "Return to function (memcpy, PIE)         ";
 
-fptr overflow[32] = {
+static const fptr overflow[32] = {
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
 	itworked, itworked, itworked, itworked, itworked, itworked, itworked, itworked,
@@ -19,7 +20,7 @@
 
 void doit( void )
 {
-	char buf[4];
+	char buf[sizeof(unsigned long)];
 
-	memcpy( buf, overflow, sizeof( overflow ) );
+	forced_memcpy( buf, overflow, sizeof( overflow ) );
 }
diff -Nru paxtest-0.9.11/shellcode.h paxtest-0.9.14/shellcode.h
--- paxtest-0.9.11/shellcode.h	2010-02-21 20:07:44.000000000 +0000
+++ paxtest-0.9.14/shellcode.h	2015-09-29 12:17:14.000000000 +0000
@@ -1,37 +1,36 @@
-#include <unistd.h>
-#include <string.h>
+#ifndef _SHELLCODE_H_
+#define _SHELLCODE_H_
+
+#include "paxtest.h"
 
 #define MAX_SHELLCODE_LEN 12
 
 #if defined(__powerpc__)
-#define SHELLCODE_RETURN_ARRAY { '\x4e', '\x80', '\x00', '\x20' }
 #define SHELLCODE_RETURN "\x4e\x80\x00\x20"
-#define SIZE_OF_SHELLCODE_RETURN 4
 #elif defined(__sparc__) && !defined(__arch64__)
-#define SHELLCODE_RETURN_ARRAY { '\x81', '\xc7', '\xe0', '\x08', '\x81', '\xe8' ,'\x00', '\x00' }
 #define SHELLCODE_RETURN "\x81\xc7\xe0\x08\x81\xe8\x00\x00"
-#define SIZE_OF_SHELLCODE_RETURN 8
 #elif defined(__sparc__) && defined(__arch64__)
-#define SHELLCODE_RETURN_ARRAY { '\x9d', '\xe3', '\xbf', '\x40', '\x81', '\xcf', '\xe0', '\x08', '\x01', '\x00', '\x00', '\x00' }
 #define SHELLCODE_RETURN "\x9d\xe3\xbf\x40\x81\xcf\xe0\x08\x01\x00\x00\x00"
-#define SIZE_OF_SHELLCODE_RETURN 12
+#elif defined(__arm__) && !defined(__arch64__)
+#define SHELLCODE_RETURN "\x1e\xff\x2f\xe1"
 #else
-#define SHELLCODE_RETURN_ARRAY { '\xc3' }
 #define SHELLCODE_RETURN "\xc3"
-#define SIZE_OF_SHELLCODE_RETURN 1
 #endif
+#define SIZE_OF_SHELLCODE_RETURN (sizeof(SHELLCODE_RETURN) - 1)
 
 #if defined(__powerpc64__)
-static inline void copy_shellcode(char *dest, char *src)
+static inline void copy_shellcode(void *dst)
 {
 	/* 12 bytes total */
-	unsigned long dstaddr = (unsigned long)dest + sizeof(dstaddr);
-	memcpy(dest, &dstaddr, sizeof(dstaddr));
-	memcpy(dest + sizeof(dstaddr), src, SIZE_OF_SHELLCODE_RETURN);
+	unsigned long dstaddr = (unsigned long)dst + sizeof(dstaddr);
+	forced_memcpy(dst, &dstaddr, sizeof(dstaddr));
+	forced_memcpy(dst + sizeof(dstaddr), SHELLCODE_RETURN, SIZE_OF_SHELLCODE_RETURN);
 }
 #else
-static inline void copy_shellcode(char *dest, char *src)
+static inline void copy_shellcode(void *dst)
 {
-	memcpy(dest, src, SIZE_OF_SHELLCODE_RETURN);
+	forced_memcpy(dst, SHELLCODE_RETURN, SIZE_OF_SHELLCODE_RETURN);
 }
 #endif
+
+#endif
diff -Nru paxtest-0.9.11/shlibbss.c paxtest-0.9.14/shlibbss.c
--- paxtest-0.9.11/shlibbss.c	2010-02-21 21:30:40.000000000 +0000
+++ paxtest-0.9.14/shlibbss.c	2015-09-29 12:20:26.000000000 +0000
@@ -46,8 +46,8 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(shbss, SHELLCODE_RETURN);
-	copy_shellcode(shbss2, SHELLCODE_RETURN);
+	copy_shellcode(shbss);
+	copy_shellcode(shbss2);
 
 	/* Convert the pointer to a function pointer */
 	func = shbss < shbss2 ? (fptr)shbss : (fptr)shbss2;
diff -Nru paxtest-0.9.11/shlibdata.c paxtest-0.9.14/shlibdata.c
--- paxtest-0.9.11/shlibdata.c	2010-02-21 21:29:13.000000000 +0000
+++ paxtest-0.9.14/shlibdata.c	2015-09-29 12:20:26.000000000 +0000
@@ -46,8 +46,8 @@
 		exit( 1 );
 	}
 
-	copy_shellcode(shdata, SHELLCODE_RETURN);
-	copy_shellcode(shdata2, SHELLCODE_RETURN);
+	copy_shellcode(shdata);
+	copy_shellcode(shdata2);
 
 	/* Convert the pointer to a function pointer */
 	func = shdata < shdata2 ? (fptr)shdata : (fptr)shdata2;
diff -Nru paxtest-0.9.11/shlibtest2.c paxtest-0.9.14/shlibtest2.c
--- paxtest-0.9.11/shlibtest2.c	2010-02-20 14:19:21.000000000 +0000
+++ paxtest-0.9.14/shlibtest2.c	2015-09-29 12:20:26.000000000 +0000
@@ -4,11 +4,11 @@
  * This file has been released under the GNU Public Licence version 2 or later
  */
 
-#include "shellcode.h"
+#include "paxtest.h"
 
-char shbss2[4096];
+char shbss2[PAGE_SIZE_MAX] __pagealigned;
 
-char shdata2[4096] = SHELLCODE_RETURN_ARRAY;
+char shdata2[PAGE_SIZE_MAX] __pagealigned = { 'A' };
 
 /* A function which does nothing, it only exists so it can be referenced */
 int shlibtest2( void )
diff -Nru paxtest-0.9.11/shlibtest.c paxtest-0.9.14/shlibtest.c
--- paxtest-0.9.11/shlibtest.c	2010-02-20 14:19:15.000000000 +0000
+++ paxtest-0.9.14/shlibtest.c	2015-09-29 12:20:26.000000000 +0000
@@ -3,11 +3,12 @@
  * Copyright (c)2003 by Peter Busser <peter@adamantix.org>
  * This file has been released under the GNU Public Licence version 2 or later
  */
-#include "shellcode.h"
 
-char shbss[4096];
+#include "paxtest.h"
 
-char shdata[4096] = SHELLCODE_RETURN_ARRAY;
+char shbss[PAGE_SIZE_MAX] __pagealigned;
+
+char shdata[PAGE_SIZE_MAX] __pagealigned = { 'A' };
 
 /* A function which does nothing, it only exists so it can be referenced */
 int shlibtest( void )
diff -Nru paxtest-0.9.11/test paxtest-0.9.14/test
--- paxtest-0.9.11/test	2016-05-03 06:33:49.000000000 +0000
+++ paxtest-0.9.14/test	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
-Released under the GNU Public Licence version 2 or later
-
-Mode: Kiddie
-Linux silicio 2.6.32-5-686 #1 SMP Sat Sep 18 02:14:45 UTC 2010 i686 GNU/Linux
-