[gentoo-commits] proj/elfix:elfix-0.8.x commit in: misc/, misc/link-maps/, misc/elf-manipulate/

[Anthony G. Basile]

commit:     a71f43bb966d020f2c5f46ff2b13fbca8224736f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 21:57:15 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 20 19:55:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=a71f43bb

misc: clean up the messy drawer

---
 misc/Makefile                              |    7 -
 misc/{ => elf-manipulate}/clear-dt-path.c  |    0
 misc/{ => elf-manipulate}/parse-elf.c      |    0
 misc/{ => elf-manipulate}/print-sections.c |    0
 misc/{ => elf-manipulate}/remove-ptpax.c   |    0
 misc/{ => link-maps}/link_map.py           |    0
 misc/{ => link-maps}/link_map_test         |    0
 misc/paxctl-xattr.c                        |  361 ----------------------------
 8 files changed, 0 insertions(+), 368 deletions(-)

diff --git a/misc/Makefile b/misc/Makefile
deleted file mode 100644
index 49653b4..0000000
--- a/misc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: clear-dt-path parse-elf print-sections paxctl-xattr
-
-%: %.c
-	gcc -o $@ $^ -lelf
-
-clean:
-	rm -rf clear-dt-path parse-elf print-sections paxctl-xattr

diff --git a/misc/clear-dt-path.c b/misc/elf-manipulate/clear-dt-path.c
similarity index 100%
rename from misc/clear-dt-path.c
rename to misc/elf-manipulate/clear-dt-path.c

diff --git a/misc/parse-elf.c b/misc/elf-manipulate/parse-elf.c
similarity index 100%
rename from misc/parse-elf.c
rename to misc/elf-manipulate/parse-elf.c

diff --git a/misc/print-sections.c b/misc/elf-manipulate/print-sections.c
similarity index 100%
rename from misc/print-sections.c
rename to misc/elf-manipulate/print-sections.c

diff --git a/misc/remove-ptpax.c b/misc/elf-manipulate/remove-ptpax.c
similarity index 100%
rename from misc/remove-ptpax.c
rename to misc/elf-manipulate/remove-ptpax.c

diff --git a/misc/link_map.py b/misc/link-maps/link_map.py
similarity index 100%
rename from misc/link_map.py
rename to misc/link-maps/link_map.py

diff --git a/misc/link_map_test b/misc/link-maps/link_map_test
similarity index 100%
rename from misc/link_map_test
rename to misc/link-maps/link_map_test

diff --git a/misc/paxctl-xattr.c b/misc/paxctl-xattr.c
deleted file mode 100644
index 3ce5297..0000000
--- a/misc/paxctl-xattr.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
-	paxctl-xattr.c: get/set pax flags on xattr for an ELF object
-	Copyright (C) 2011  Anthony G. Basile
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <error.h>
-#include <errno.h>
-#include <libgen.h>
-
-#include <gelf.h>
-#include <attr/xattr.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#define PAX_NAMESPACE "user.pax"
-
-void
-print_help(char *v)
-{
-	printf(
-		"\n"
-		"Program Name : %s\n"
-		"Description  : Get or set xattr pax flags on an ELF object\n\n"
-		"Usage        : %s [-PpEeMmRrXxSsv ELF] | [-Z ELF] | [-z ELF] | [-h]\n\n"
-		"Options      : -P enable PAGEEXEC\t-p disable  PAGEEXEC\n"
-		"             : -S enable SEGMEXEC\t-s disable  SEGMEXEC\n"
-		"             : -M enable MPROTECT\t-m disable  MPROTECT\n"
-		"             : -E enable EMUTRAMP\t-e disable  EMUTRAMP\n"
-		"             : -R enable RANDMMAP\t-r disable  RANDMMAP\n"
-		"             : -X enable RANDEXEC\t-x disable  RANDEXEC\n"
-		"             : -Z most secure settings\t-z all default settings\n"
-		"             : -v view the flags\n"
-		"             : -h print out this help\n\n"
-		"Note         :  If both enabling and disabling flags are set, the default - is used\n\n",
-		basename(v),
-		basename(v)
-	);
-
-	exit(EXIT_SUCCESS);
-}
-
-
-char *
-parse_cmd_args(int c, char *v[], int *pax_flags, int *view_flags)
-{
-	int i, oc;
-	int compat;
-
-	compat = 0;
-
-	*pax_flags = 0;
-	*view_flags = 0;
-	while((oc = getopt(c, v,":PpEeMmRrXxSsZzvh")) != -1)
-		switch(oc)
-		{
-			case 'P':
-				*pax_flags |= PF_PAGEEXEC;
-				compat |= 1;
-				break;
-			case 'p':
-				*pax_flags |= PF_NOPAGEEXEC;
-				compat |= 1;
-				break ;
-			case 'S':
-				*pax_flags |= PF_SEGMEXEC;
-				compat |= 1;
-				break;
-			case 's':
-				*pax_flags |= PF_NOSEGMEXEC;
-				compat |= 1;
-				break ;
-			case 'M':
-				*pax_flags |= PF_MPROTECT;
-				compat |= 1;
-				break;
-			case 'm':
-				*pax_flags |= PF_NOMPROTECT;
-				compat |= 1;
-				break ;
-			case 'E':
-				*pax_flags |= PF_EMUTRAMP;
-				compat |= 1;
-				break;
-			case 'e':
-				*pax_flags |= PF_NOEMUTRAMP;
-				compat |= 1;
-				break ;
-			case 'R':
-				*pax_flags |= PF_RANDMMAP;
-				compat |= 1;
-				break;
-			case 'r':
-				*pax_flags |= PF_NORANDMMAP;
-				compat |= 1;
-				break ;
-			case 'X':
-				*pax_flags |= PF_RANDEXEC;
-				compat |= 1;
-				break;
-			case 'x':
-				*pax_flags |= PF_NORANDEXEC;
-				compat |= 1;
-				break ;
-			case 'Z':
-				*pax_flags = PF_PAGEEXEC | PF_SEGMEXEC | PF_MPROTECT |
-					PF_NOEMUTRAMP | PF_RANDMMAP | PF_RANDEXEC;
-				compat += 1;
-				break ;
-			case 'z':
-				*pax_flags = PF_PAGEEXEC | PF_NOPAGEEXEC | PF_SEGMEXEC | PF_NOSEGMEXEC |
-					PF_MPROTECT | PF_NOMPROTECT | PF_EMUTRAMP | PF_NOEMUTRAMP |
-					PF_RANDMMAP | PF_NORANDMMAP | PF_RANDEXEC | PF_NORANDEXEC;
-				compat += 1;
-				break;
-			case 'v':
-				*view_flags = 1;
-				compat |= 1;
-				break;
-			case 'h':
-				print_help(v[0]);
-				break;
-			case '?':
-			default:
-				error(EXIT_FAILURE, 0, "option -%c is invalid: ignored.", optopt ) ;
-		}
-
-	if(compat != 1 || v[optind] == NULL)
-		print_help(v[0]);
-
-	return v[optind] ;
-}
-
-
-uint16_t
-read_flags(int fd)
-{
-	//UINT16_MAX is an invalid value
-	uint16_t xt_flags = UINT16_MAX;
-
-	if(fgetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t)) == -1)
-	{
-		//xattrs is supported, PAX_NAMESPACE is present, but it is the wrong size
-		if(errno == ERANGE)
-		{
-			printf("XATTR_PAX: malformed flags found\n");
-			//FIXME remove the user.pax field
-			xt_flags = 0;
-		}
-
-		//xattrs is supported, PAX_NAMESPACE is not present
-		if(errno == ENOATTR)
-		{
-			printf("XATTR_PAX: not found\n");
-			xt_flags = 0;
-		}
-
-		//xattrs is not supported
-		if(errno == ENOTSUP)
-			printf("XATTR_PAX: extended attribute not supported\n");
-	}
-
-	return xt_flags;
-}
-
-
-#define BUF_SIZE 7
-void
-print_flags(int fd)
-{
-	uint16_t xt_flags;
-	char xt_buf[BUF_SIZE];
-
-	memset(xt_buf, 0, BUF_SIZE);
-
-	//If an invalid value is returned, then skip this
-	if((xt_flags = read_flags(fd)) == UINT16_MAX)
-		return ;
-
-	xt_buf[0] = xt_flags & PF_PAGEEXEC ? 'P' :
-		xt_flags & PF_NOPAGEEXEC ? 'p' : '-' ;
-
-	xt_buf[1] = xt_flags & PF_SEGMEXEC   ? 'S' : 
-		xt_flags & PF_NOSEGMEXEC ? 's' : '-';
-
-	xt_buf[2] = xt_flags & PF_MPROTECT   ? 'M' :
-		xt_flags & PF_NOMPROTECT ? 'm' : '-';
-
-	xt_buf[3] = xt_flags & PF_EMUTRAMP   ? 'E' :
-		xt_flags & PF_NOEMUTRAMP ? 'e' : '-';
-
-	xt_buf[4] = xt_flags & PF_RANDMMAP   ? 'R' :
-		xt_flags & PF_NORANDMMAP ? 'r' : '-';
-
-	xt_buf[5] = xt_flags & PF_RANDEXEC   ? 'X' :
-		xt_flags & PF_NORANDEXEC ? 'x' : '-';
-
-	printf("XATTR_PAX: %s\n", xt_buf);
-}
-
-
-void
-set_flags(int fd, int *pax_flags)
-{
-	uint16_t xt_flags;
-
-	//If an invalid value is returned, then skip this
-	if((xt_flags = read_flags(fd)) == UINT16_MAX)
-		return ;
-
-	//PAGEEXEC
-	if(*pax_flags & PF_PAGEEXEC)
-	{
-		xt_flags |= PF_PAGEEXEC;
-		xt_flags &= ~PF_NOPAGEEXEC;
-	}
-	if(*pax_flags & PF_NOPAGEEXEC)
-	{
-		xt_flags &= ~PF_PAGEEXEC;
-		xt_flags |= PF_NOPAGEEXEC;
-	}
-	if((*pax_flags & PF_PAGEEXEC) && (*pax_flags & PF_NOPAGEEXEC))
-	{
-		xt_flags &= ~PF_PAGEEXEC;
-		xt_flags &= ~PF_NOPAGEEXEC;
-	}
-
-	//SEGMEXEC
-	if(*pax_flags & PF_SEGMEXEC)
-	{
-		xt_flags |= PF_SEGMEXEC;
-		xt_flags &= ~PF_NOSEGMEXEC;
-	}
-	if(*pax_flags & PF_NOSEGMEXEC)
-	{
-		xt_flags &= ~PF_SEGMEXEC;
-		xt_flags |= PF_NOSEGMEXEC;
-	}
-	if((*pax_flags & PF_SEGMEXEC) && (*pax_flags & PF_NOSEGMEXEC))
-	{
-		xt_flags &= ~PF_SEGMEXEC;
-		xt_flags &= ~PF_NOSEGMEXEC;
-	}
-
-	//MPROTECT
-	if(*pax_flags & PF_MPROTECT)
-	{
-		xt_flags |= PF_MPROTECT;
-		xt_flags &= ~PF_NOMPROTECT;
-	}
-	if(*pax_flags & PF_NOMPROTECT)
-	{
-		xt_flags &= ~PF_MPROTECT;
-		xt_flags |= PF_NOMPROTECT;
-	}
-	if((*pax_flags & PF_MPROTECT) && (*pax_flags & PF_NOMPROTECT))
-	{
-		xt_flags &= ~PF_MPROTECT;
-		xt_flags &= ~PF_NOMPROTECT;
-	}
-
-	//EMUTRAMP
-	if(*pax_flags & PF_EMUTRAMP)
-	{
-		xt_flags |= PF_EMUTRAMP;
-		xt_flags &= ~PF_NOEMUTRAMP;
-	}
-	if(*pax_flags & PF_NOEMUTRAMP)
-	{
-		xt_flags &= ~PF_EMUTRAMP;
-		xt_flags |= PF_NOEMUTRAMP;
-	}
-	if((*pax_flags & PF_EMUTRAMP) && (*pax_flags & PF_NOEMUTRAMP))
-	{
-		xt_flags &= ~PF_EMUTRAMP;
-		xt_flags &= ~PF_NOEMUTRAMP;
-	}
-
-	//RANDMMAP
-	if(*pax_flags & PF_RANDMMAP)
-	{
-		xt_flags |= PF_RANDMMAP;
-		xt_flags &= ~PF_NORANDMMAP;
-	}
-	if(*pax_flags & PF_NORANDMMAP)
-	{
-		xt_flags &= ~PF_RANDMMAP;
-		xt_flags |= PF_NORANDMMAP;
-	}
-	if((*pax_flags & PF_RANDMMAP) && (*pax_flags & PF_NORANDMMAP))
-	{
-		xt_flags &= ~PF_RANDMMAP;
-		xt_flags &= ~PF_NORANDMMAP;
-	}
-
-	//RANDEXEC
-	if(*pax_flags & PF_RANDEXEC)
-	{
-		xt_flags |= PF_RANDEXEC;
-		xt_flags &= ~PF_NORANDEXEC;
-	}
-	if(*pax_flags & PF_NORANDEXEC)
-	{
-		xt_flags &= ~PF_RANDEXEC;
-		xt_flags |= PF_NORANDEXEC;
-	}
-	if((*pax_flags & PF_RANDEXEC) && (*pax_flags & PF_NORANDEXEC))
-	{
-		xt_flags &= ~PF_RANDEXEC;
-		xt_flags &= ~PF_NORANDEXEC;
-	}
-
-	if(fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0) == -1)
-	{
-		if(errno == ENOSPC || errno == EDQUOT)
-			printf("XATTR_PAX: cannot store xt_flags\n");
-		if(errno == ENOTSUP)
-			printf("XATTR_PAX: extended attribute not supported\n");
-	}
-}
-
-
-int
-main( int argc, char *argv[])
-{
-	int fd;
-	int pax_flags, view_flags;
-	char *f_name;
-
-	f_name = parse_cmd_args(argc, argv, &pax_flags, &view_flags);
-
-	if((fd = open(f_name, O_RDWR)) < 0)
-		error(EXIT_FAILURE, 0, "open() fail.");
-
-	if(pax_flags != 0)
-		set_flags(fd, &pax_flags);
-
-	if(view_flags == 1)
-		print_flags(fd);
-
-	close(fd);
-}