From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-394072-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RGx6o-0006ig-Ga
	for garchives@archives.gentoo.org; Thu, 20 Oct 2011 18:12:50 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2F8AC21C020;
	Thu, 20 Oct 2011 18:12:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id E2B0821C020
	for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2011 18:12:40 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4DB981B4008
	for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2011 18:12:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 6DB4D80042
	for <gentoo-commits@lists.gentoo.org>; Thu, 20 Oct 2011 18:12:39 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org>
Message-ID: <1efd8ec798c7ae81e19d1b781fa119e07552d538.blueness@gentoo>
Subject: [gentoo-commits] proj/elfix:master commit in: src/, scripts/
X-VCS-Repository: proj/elfix
X-VCS-Files: scripts/paxmodule.c src/paxctl-ng.c
X-VCS-Directories: src/ scripts/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: 1efd8ec798c7ae81e19d1b781fa119e07552d538
Date: Thu, 20 Oct 2011 18:12:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 5aa10c03abfc075a8f2abad4b4dde9c7

commit:     1efd8ec798c7ae81e19d1b781fa119e07552d538
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 18:12:31 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 18:12:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D=
commit;h=3D1efd8ec7

src/paxctl-ng.c: clean up error handling

---
 scripts/paxmodule.c |   50 ++++++------------------------------------
 src/paxctl-ng.c     |   60 +++++++++------------------------------------=
-----
 2 files changed, 18 insertions(+), 92 deletions(-)

diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c
index c5a7aa6..ed74430 100644
--- a/scripts/paxmodule.c
+++ b/scripts/paxmodule.c
@@ -65,9 +65,7 @@ get_pt_flags(int fd)
 	GElf_Phdr phdr;
 	size_t i, phnum;
=20
-	uint16_t pt_flags;
-
-	pt_flags =3D UINT16_MAX;
+	uint16_t pt_flags =3D UINT16_MAX;
=20
 	if(elf_version(EV_CURRENT) =3D=3D EV_NONE)
 	{
@@ -93,7 +91,10 @@ get_pt_flags(int fd)
 	for(i=3D0; i<phnum; i++)
 	{
 		if(gelf_getphdr(elf, i, &phdr) !=3D &phdr)
+		{
 			PyErr_SetString(PaxError, "get_pt_flags: gelf_getphdr() failed: could=
 not get phdr.");
+			return pt_flags;
+		}
=20
 		if(phdr.p_type =3D=3D PT_PAX_FLAGS)
 			pt_flags =3D phdr.p_flags;
@@ -108,38 +109,9 @@ get_pt_flags(int fd)
 uint16_t
 get_xt_flags(int fd)
 {
-	uint16_t xt_flags;
-
-	xt_flags =3D UINT16_MAX;
-
-	if(fgetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t)) =3D=3D -1)
-	{
-		/*
-		// ERANGE  =3D xattrs supported, PAX_NAMESPACE present, but wrong size
-		// ENOATTR =3D xattrs supported, PAX_NAMESPACE not present
-		if(errno =3D=3D ERANGE || errno =3D=3D ENOATTR)
-		{
-			//XT_PAX: not present or corrupted
+	uint16_t xt_flags =3D UINT16_MAX;
=20
-			//BEGIN: create flags
-			PyErr_SetString(PaxError, "XT_PAX: creating/repairing flags");
-			xt_flags =3D PF_NOEMUTRAMP | PF_NORANDEXEC;
-			if(fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0) =3D=3D=
 -1)
-			{
-				xt_flags =3D UINT16_MAX;
-				if(errno =3D=3D ENOSPC || errno =3D=3D EDQUOT)
-					PyErr_SetString(PaxError, "XT_PAX: access error");
-				if(errno =3D=3D ENOTSUP)
-					PyErr_SetString(PaxError, "XT_PAX: not supported");
-			}
-			// END: create flags
-		}
-
-		// ENOTSUP =3D xattrs not supported
-		if(errno =3D=3D ENOTSUP)
-			PyErr_SetString(PaxError, "XT_PAX: not supported\n");
-		*/
-	}
+	fgetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t));
=20
 	return xt_flags;
 }
@@ -269,15 +241,7 @@ set_pt_flags(int fd, uint16_t pt_flags)
 void
 set_xt_flags(int fd, uint16_t xt_flags)
 {
-	if(fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0) =3D=3D =
-1)
-	{
-		/*
-		if(errno =3D=3D ENOSPC || errno =3D=3D EDQUOT)
-			 PyErr_SetString(PaxError, "XT_PAX: access error");
-		if(errno =3D=3D ENOTSUP)
-			 PyErr_SetString(PaxError, "XT_PAX: not supported\n");
-		*/
-	}
+	fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0);
 }
=20
=20

diff --git a/src/paxctl-ng.c b/src/paxctl-ng.c
index aaeadaf..8d9bf55 100644
--- a/src/paxctl-ng.c
+++ b/src/paxctl-ng.c
@@ -163,27 +163,18 @@ get_pt_flags(int fd)
 	GElf_Phdr phdr;
 	size_t i, phnum;
=20
-	uint16_t pt_flags;
-
-	pt_flags =3D UINT16_MAX;
+	uint16_t pt_flags =3D UINT16_MAX;
=20
 	if(elf_version(EV_CURRENT) =3D=3D EV_NONE)
-	{
 		error(EXIT_FAILURE, 0, "Library out of date.");
-		return;
-	}
=20
 	if((elf =3D elf_begin(fd, ELF_C_READ_MMAP, NULL)) =3D=3D NULL)
-	{
 		error(EXIT_FAILURE, 0, "elf_begin() fail: %s", elf_errmsg(elf_errno())=
);
-		return;
-	}
=20
 	if(elf_kind(elf) !=3D ELF_K_ELF)
 	{
 		elf_end(elf);
 		error(EXIT_FAILURE, 0, "elf_kind() fail: this is not an elf file.");
-		return;
 	}
=20
 	elf_getphdrnum(elf, &phnum);
@@ -191,14 +182,16 @@ get_pt_flags(int fd)
 	for(i=3D0; i<phnum; i++)
 	{
 		if(gelf_getphdr(elf, i, &phdr) !=3D &phdr)
+		{
+			elf_end(elf);
 			error(EXIT_FAILURE, 0, "gelf_getphdr(): %s", elf_errmsg(elf_errno()))=
;
+		}
=20
 		if(phdr.p_type =3D=3D PT_PAX_FLAGS)
 			pt_flags =3D phdr.p_flags;
 	}
=20
 	elf_end(elf);
-
 	return pt_flags;
 }
=20
@@ -206,32 +199,16 @@ get_pt_flags(int fd)
 uint16_t
 get_xt_flags(int fd)
 {
-	uint16_t xt_flags;
-
-	xt_flags =3D UINT16_MAX;
+	uint16_t xt_flags =3D UINT16_MAX;
=20
 	if(fgetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t)) =3D=3D -1)
 	{
-		// ERANGE  =3D xattrs supported, PAX_NAMESPACE present, but wrong size
-		// ENOATTR =3D xattrs supported, PAX_NAMESPACE not present
-		if(errno =3D=3D ERANGE || errno =3D=3D ENOATTR)
-		{
-			printf("XT_PAX: not present or corrupted\n");
-			/*
-			printf("XT_PAX: creating/repairing flags\n");
-			xt_flags =3D PF_NOEMUTRAMP | PF_NORANDEXEC;
-			if(fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0) =3D=3D=
 -1)
-			{
-				xt_flags =3D UINT16_MAX;
-				if(errno =3D=3D ENOSPC || errno =3D=3D EDQUOT)
-					printf("XT_PAX: access error\n");
-				if(errno =3D=3D ENOTSUP)
-					printf("XT_PAX: not supported\n");
-			}
-			*/
-		}
+		if(errno =3D=3D ERANGE )
+			printf("XT_PAX: corrupted\n");
+
+		if( errno =3D=3D ENOATTR)
+			printf("XT_PAX: not present\n");
=20
-		// ENOTSUP =3D xattrs not supported
 		if(errno =3D=3D ENOTSUP)
 			printf("XT_PAX: not supported\n");
 	}
@@ -271,9 +248,7 @@ print_flags(int fd)
=20
 	flags =3D get_pt_flags(fd);
 	if( flags =3D=3D UINT16_MAX )
-	{
 		printf("PT_PAX: not found\n");
-	}
 	else
 	{
 		memset(buf, 0, BUF_SIZE);
@@ -283,9 +258,7 @@ print_flags(int fd)
=20
 	flags =3D get_xt_flags(fd);
 	if( flags =3D=3D UINT16_MAX )
-	{
 		printf("XT_PAX: not found\n");
-	}
 	else
 	{
 		memset(buf, 0, BUF_SIZE);
@@ -413,22 +386,15 @@ set_pt_flags(int fd, uint16_t pt_flags)
 	size_t i, phnum;
=20
 	if(elf_version(EV_CURRENT) =3D=3D EV_NONE)
-	{
 		error(EXIT_FAILURE, 0, "Library out of date.");
-		return;
-	}
=20
 	if((elf =3D elf_begin(fd, ELF_C_RDWR_MMAP, NULL)) =3D=3D NULL)
-	{
 		error(EXIT_FAILURE, 0, "elf_begin() fail: %s", elf_errmsg(elf_errno())=
);
-		return;
 	}
-
 	if(elf_kind(elf) !=3D ELF_K_ELF)
 	{
 		elf_end(elf);
 		error(EXIT_FAILURE, 0, "elf_kind() fail: this is not an elf file.");
-		return;
 	}
=20
 	elf_getphdrnum(elf, &phnum);
@@ -439,7 +405,6 @@ set_pt_flags(int fd, uint16_t pt_flags)
 		{
 			elf_end(elf);
 			error(EXIT_FAILURE, 0, "gelf_getphdr(): %s", elf_errmsg(elf_errno()))=
;
-			return;
 		}
=20
 		if(phdr.p_type =3D=3D PT_PAX_FLAGS)
@@ -450,7 +415,6 @@ set_pt_flags(int fd, uint16_t pt_flags)
 			{
 				elf_end(elf);
 				error(EXIT_FAILURE, 0, "gelf_update_phdr(): %s", elf_errmsg(elf_errn=
o()));
-				return;
 			}
 		}
 	}
@@ -465,7 +429,7 @@ set_xt_flags(int fd, uint16_t xt_flags)
 	if(fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0) =3D=3D =
-1)
 	{
 		if(errno =3D=3D ENOSPC || errno =3D=3D EDQUOT)
-			printf("XT_PAX: access error\n");
+			printf("XT_PAX: insufficient space\n");
 		if(errno =3D=3D ENOTSUP)
 			printf("XT_PAX: not supported\n");
 	}
@@ -501,8 +465,6 @@ main( int argc, char *argv[])
 	uint16_t flags;
 	int view_flags;
=20
-	Elf *elf;
-
 	f_name =3D parse_cmd_args(argc, argv, &flags, &view_flags);
=20
 	if((fd =3D open(f_name, O_RDWR)) < 0)