aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-28 05:14:26 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-28 05:14:26 +0000
commit070adba396853087de03151d0bee9cb12c19863d (patch)
treeb790e405aa26e37a83dc17e7931d7ff60d71cca0 /paxelf.c
parentupdate freebsd/fedora info (diff)
downloadpax-utils-070adba396853087de03151d0bee9cb12c19863d.tar.gz
pax-utils-070adba396853087de03151d0bee9cb12c19863d.tar.bz2
pax-utils-070adba396853087de03151d0bee9cb12c19863d.zip
drop EI_PAX setting when modifying pax flags #411919
Diffstat (limited to 'paxelf.c')
-rw-r--r--paxelf.c52
1 files changed, 1 insertions, 51 deletions
diff --git a/paxelf.c b/paxelf.c
index f3bd83c..e58a5e6 100644
--- a/paxelf.c
+++ b/paxelf.c
@@ -1,7 +1,7 @@
/*
* Copyright 2003-2007 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.70 2010/01/15 12:06:37 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.71 2012/04/28 05:14:26 vapier Exp $
*
* Copyright 2005-2007 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2007 Mike Frysinger - <vapier@gentoo.org>
@@ -675,56 +675,6 @@ char *pax_short_pf_flags(unsigned long flags)
return buffer;
}
-unsigned long pax_pf2hf_flags(unsigned long paxflags)
-{
- unsigned long flags = 0;
- char *pf_flags = pax_short_pf_flags(paxflags);
- size_t x, len = strlen(pf_flags);
- for (x = 0; x < len; x++) {
- switch (pf_flags[x]) {
- case 'p':
- flags |= HF_PAX_PAGEEXEC;
- break;
- case 'P':
- flags = (flags & ~HF_PAX_PAGEEXEC) | HF_PAX_SEGMEXEC;
- break;
- case 'E':
- flags |= HF_PAX_EMUTRAMP;
- break;
- case 'e':
- flags = (flags & ~HF_PAX_EMUTRAMP);
- break;
- case 'm':
- flags |= HF_PAX_MPROTECT;
- break;
- case 'M':
- flags = (flags & ~HF_PAX_MPROTECT);
- break;
- case 'r':
- flags |= HF_PAX_RANDMMAP;
- break;
- case 'R':
- flags = (flags & ~HF_PAX_RANDMMAP);
- break;
- case 'X':
- flags |= HF_PAX_RANDEXEC;
- break;
- case 'x':
- flags = (flags & ~HF_PAX_RANDEXEC);
- break;
- case 's':
- flags |= HF_PAX_SEGMEXEC;
- break;
- case 'S':
- flags = (flags & ~HF_PAX_SEGMEXEC) | HF_PAX_PAGEEXEC;
- break;
- default:
- break;
- }
- }
- return flags;
-}
-
char *gnu_short_stack_flags(unsigned long flags)
{
static char buffer[4];