From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/elfix:master commit in: scripts/
Date: Sat, 22 Dec 2012 19:02:55 +0000 (UTC) [thread overview]
Message-ID: <1356202966.f996aa44031bb23e073c0b15d95d0c81298d0140.blueness@gentoo> (raw)
commit: f996aa44031bb23e073c0b15d95d0c81298d0140
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 19:02:46 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 19:02:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=f996aa44
scripts/pypaxctl: make aware if XATTR_PAX support is available in pax.so
---
scripts/paxmodule.c | 6 +++-
scripts/pypaxctl | 70 +++++++++++++++++++++++++++------------------------
2 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c
index 9d7e4e0..3e335b4 100644
--- a/scripts/paxmodule.c
+++ b/scripts/paxmodule.c
@@ -650,8 +650,9 @@ static PyObject *
pax_deleteflags(PyObject *self, PyObject *args)
{
const char *f_name;
+ int fd;
- if(!PyArg_ParseTuple(args, "s", &f_names))
+ if(!PyArg_ParseTuple(args, "s", &f_name))
{
PyErr_SetString(PaxError, "pax_deleteflags: PyArg_ParseTuple failed");
return NULL;
@@ -666,6 +667,9 @@ pax_deleteflags(PyObject *self, PyObject *args)
if( !fremovexattr(fd, PAX_NAMESPACE) )
return Py_BuildValue("");
else
+ {
+ PyErr_SetString(PaxError, "pax_deleteflags: fremovexattr() failed");
return NULL;
+ }
}
#endif
diff --git a/scripts/pypaxctl b/scripts/pypaxctl
index 6734e36..809d074 100755
--- a/scripts/pypaxctl
+++ b/scripts/pypaxctl
@@ -22,24 +22,38 @@ import sys
import getopt
import pax
+xattr_available = True
+try:
+ from pax import deleteflags
+except ImportError:
+ xattr_available = False
+
def run_usage():
print('Package Name : elfix')
print('Bug Reports : http://bugs.gentoo.org/')
print('Program Name : pypaxctl')
- print('Description : Get/set/delete PT_PAX or XATTR_PAX flags on an ELF object')
- print('')
- print('Usage : pypaxctl -g ELF get XATTR_PAX flags first, else get PT_PAX flags')
- print(' : pypaxctl -s [-PpEeMmRrSs] ELF set PT_PAX and XATTR_PAX flags whenever possible')
- print(' : pypaxctl -d ELF delete the XATTR_PAX field')
- print('')
- print('Note : If the pax.so module is compiled without PT_PAX or XATTR_PAX, then no operation will')
- print(' : be done on that field. Note -d is not available unless XATTR_PAX support is present')
+ if xattr_available:
+ print('Description : Get/set/delete PT_PAX or XATTR_PAX flags on an ELF object')
+ print('')
+ print('Usage : pypaxctl -g ELF get XATTR_PAX flags first, else get PT_PAX flags')
+ print(' : pypaxctl -s [-PpEeMmRrSs] ELF set PT_PAX and XATTR_PAX flags whenever possible')
+ print(' : pypaxctl -d ELF delete the XATTR_PAX field')
+ else:
+ print('Description : Get/set PT_PAX flags on an ELF object')
+ print('')
+ print('Usage : pypaxctl -g ELF get PT_PAX flags')
+ print(' : pypaxctl -s [-PpEeMmRrSs] ELF set PT_PAX flags whenever possible')
+ print('')
+ print('Note : Python module pax.so was compiled without XATTR_PAX support')
print('')
def main():
try:
- opts, args = getopt.getopt(sys.argv[1:], 'gs:d')
+ if xattr_available:
+ opts, args = getopt.getopt(sys.argv[1:], 'gs:d')
+ else:
+ opts, args = getopt.getopt(sys.argv[1:], 'gs:')
except getopt.GetoptError as err:
print(err)
sys.exit(1)
@@ -48,34 +62,24 @@ def main():
run_usage()
sys.exit(1)
- elf = None
- do_get = False
- do_set = False
- do_del = False
-
for o, a in opts:
if o == '-g':
- do_get = True
+ for elf in args:
+ ( str_flags, bin_flags ) = pax.getflags(elf)
+ print('%s' % str_flags)
elif o == '-s':
- flags = a
- do_set = True
- else:
- do_del = True
+ for elf in args:
+ pax.setstrflags(elf, a)
- if( do_get ):
- for elf in args:
- ( str_flags, bin_flags ) = pax.getflags(elf)
- print('%s' % str_flags)
- elif( do_set ):
- for elf in args:
- pax.setstrflags(elf, flags)
- else:
- for elf in args:
- try:
- pax.deleteflags(elf)
- except pax.error:
- print('pax_deleteflags: XATTR_PAX not supported')
- sys.exit(1)
+ # Don't worry if xattr_available = False
+ # because we can't get here if it is.
+ else:
+ for elf in args:
+ try:
+ pax.deleteflags(elf)
+ except pax.error:
+ print('pax_deleteflags: XATTR_PAX not supported')
+ sys.exit(1)
if __name__ == '__main__':
main()
next reply other threads:[~2012-12-22 19:03 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-22 19:02 Anthony G. Basile [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-18 18:21 [gentoo-commits] proj/elfix:master commit in: scripts/ Anthony G. Basile
2019-04-22 22:14 Anthony G. Basile
2015-10-27 19:37 Anthony G. Basile
2015-01-04 15:42 Anthony G. Basile
2014-12-22 17:29 Anthony G. Basile
2014-10-17 20:02 Anthony G. Basile
2014-01-23 16:22 Anthony G. Basile
2014-01-20 22:44 Anthony G. Basile
2013-05-20 19:47 Anthony G. Basile
2013-03-14 2:39 Anthony G. Basile
2013-01-06 17:19 Anthony G. Basile
2012-12-28 19:34 Anthony G. Basile
2012-12-23 3:49 Anthony G. Basile
2012-12-23 2:36 Anthony G. Basile
2012-12-23 1:04 Anthony G. Basile
2012-12-22 22:20 Anthony G. Basile
2012-12-22 20:17 Anthony G. Basile
2012-12-22 19:42 Anthony G. Basile
2012-12-22 19:29 Anthony G. Basile
2012-12-22 18:31 Anthony G. Basile
2012-12-22 16:36 Anthony G. Basile
2012-12-22 1:04 Anthony G. Basile
2012-12-20 4:26 Anthony G. Basile
2012-12-19 4:09 Anthony G. Basile
2012-12-19 3:51 Anthony G. Basile
2012-12-15 20:03 Anthony G. Basile
2012-12-14 2:19 Anthony G. Basile
2012-12-14 2:16 Anthony G. Basile
2012-12-14 2:04 Anthony G. Basile
2012-12-14 1:59 Anthony G. Basile
2012-12-14 1:26 Anthony G. Basile
2012-12-14 1:20 Anthony G. Basile
2012-07-27 22:01 Anthony G. Basile
2012-07-23 19:18 Anthony G. Basile
2012-07-23 15:46 Anthony G. Basile
2012-07-23 15:27 Anthony G. Basile
2012-07-23 14:58 Anthony G. Basile
2012-07-23 14:15 Anthony G. Basile
2012-07-23 13:06 Anthony G. Basile
2012-07-23 11:47 Anthony G. Basile
2012-07-22 23:11 Anthony G. Basile
2012-07-22 22:22 Anthony G. Basile
2012-07-21 16:28 Anthony G. Basile
2012-07-21 15:44 Anthony G. Basile
2012-07-21 15:41 Anthony G. Basile
2012-07-21 13:53 Anthony G. Basile
2011-12-28 23:19 Anthony G. Basile
2011-12-28 23:18 Anthony G. Basile
2011-12-28 16:37 Anthony G. Basile
2011-12-28 15:39 Anthony G. Basile
2011-12-28 15:31 Anthony G. Basile
2011-12-26 22:24 Anthony G. Basile
2011-12-26 20:25 Anthony G. Basile
2011-12-04 21:43 Anthony G. Basile
2011-11-27 0:17 Anthony G. Basile
2011-11-26 22:08 Anthony G. Basile
2011-11-26 21:15 Anthony G. Basile
2011-11-26 19:08 Anthony G. Basile
2011-11-26 19:07 Anthony G. Basile
2011-10-17 20:55 Anthony G. Basile
2011-10-17 20:15 Anthony G. Basile
2011-10-17 19:28 Anthony G. Basile
2011-10-16 18:27 Anthony G. Basile
2011-10-16 18:27 Anthony G. Basile
2011-10-16 18:04 Anthony G. Basile
2011-10-13 4:36 Anthony G. Basile
2011-10-13 2:27 Anthony G. Basile
2011-10-13 0:36 Anthony G. Basile
2011-10-11 0:50 Anthony G. Basile
2011-10-10 23:42 Anthony G. Basile
2011-10-10 23:21 Anthony G. Basile
2011-10-10 17:30 Anthony G. Basile
2011-10-10 17:29 Anthony G. Basile
2011-10-08 18:35 Anthony G. Basile
2011-10-08 2:03 Anthony G. Basile
2011-10-08 0:46 Anthony G. Basile
2011-10-07 22:14 Anthony G. Basile
2011-10-07 19:58 Anthony G. Basile
2011-10-07 1:56 Anthony G. Basile
2011-10-06 23:39 Anthony G. Basile
2011-10-06 20:14 Anthony G. Basile
2011-10-06 19:46 Anthony G. Basile
2011-10-06 4:19 Anthony G. Basile
2011-10-06 4:07 Anthony G. Basile
2011-10-06 3:14 Anthony G. Basile
2011-10-06 3:13 Anthony G. Basile
2011-10-06 2:20 Anthony G. Basile
2011-09-08 23:50 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356202966.f996aa44031bb23e073c0b15d95d0c81298d0140.blueness@gentoo \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox