 @@ -1,14 +1,14 @@
-/* $NetBSD: paxctl.c,v 1.10 2009/05/02 06:01:30 elad Exp $ */
+/* $NetBSD: paxctl.c,v 1.11 2009/05/02 16:19:36 christos Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
  * Copyright (c) 2008 Christos Zoulas <christos@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -24,27 +24,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #ifdef __RCSID
-__RCSID("$NetBSD: paxctl.c,v 1.10 2009/05/02 06:01:30 elad Exp $");
+__RCSID("$NetBSD: paxctl.c,v 1.11 2009/05/02 16:19:36 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #ifdef HAVE_NBTOOL_CONFIG_H
 #include "../../sys/sys/exec_elf.h"
 #else
 #include <elf.h>
 #endif
 #include <stdio.h>
 #include <err.h>
 #include <fcntl.h>
 #include <unistd.h>
 @@ -183,151 +183,142 @@ process_one(const char *name, uint32_t a
     /*LINTED*/(sizeof(a) == 1 ? (a) : \
     /*LINTED*/(sizeof(a) == 2 ? bswap16(a) : \
     /*LINTED*/(sizeof(a) == 4 ? bswap32(a) : \
     /*LINTED*/(sizeof(a) == 8 ? bswap64(a) : (abort(), (a)))))))
 #define EH(field)	(size == 32 ? SWAP(e.h32.field) : SWAP(e.h64.field))
 #define PH(field)	(size == 32 ? SWAP(p.h32.field) : SWAP(p.h64.field))
 #define NH(field)	(size == 32 ? SWAP(n.h32.field) : SWAP(n.h64.field))
 #define PHSIZE		(size == 32 ? sizeof(p.h32) : sizeof(p.h64))
 #define NHSIZE		(size == 32 ? sizeof(n.h32) : sizeof(n.h64))
 	struct {
 		char name[ELF_NOTE_PAX_NAMESZ];
 		uint32_t flags;
 	} pax_tag;
-	int fd, size, ok = 0, flagged = 0, swap;
+	int fd, size, ok = 0, flagged = 0, swap, error = 1;
 	size_t i;
 	fd = open(name, list ? O_RDONLY: O_RDWR, 0);
 	if (fd == -1) {
 		warn("Can't open `%s'", name);
-		return 1;
+		return error;
+	}
 	if (read(fd, &e, sizeof(e)) != sizeof(e)) {
 		warn("Can't read ELF header from `%s'", name);
-		(void)close(fd);
+		goto out;
 		return 1;
+	}
 	if (memcmp(e.h32.e_ident, ELFMAG, SELFMAG) != 0) {
 		warnx("Bad ELF magic from `%s' (maybe it's not an ELF?)", name);
-		(void)close(fd);
+		goto out;
 		return 1;
+	}
 	if (e.h32.e_ehsize == sizeof(e.h32)) {
 		size = 32;
 		swap = 0;
 	} else if (e.h64.e_ehsize == sizeof(e.h64)) {
 		size = 64;
 		swap = 0;
 	} else if (bswap16(e.h32.e_ehsize) == sizeof(e.h32)) {
 		size = 32;
 		swap = 1;
 	} else if (bswap16(e.h64.e_ehsize) == sizeof(e.h64)) {
 		size = 64;
 		swap = 1;
 	} else {
 		warnx("Bad ELF size %d from `%s' (maybe it's not an ELF?)",
 		    (int)e.h32.e_ehsize, name);
-		(void)close(fd);
+		goto out;
 		return 1;
+	}
 	for (i = 0; i < EH(e_phnum); i++) {
-		if ((size_t)pread(fd, &p, PHSIZE, (off_t)EH(e_phoff) + i * PHSIZE) !=
+		if ((size_t)pread(fd, &p, PHSIZE,
-		    PHSIZE) {
+		    (off_t)EH(e_phoff) + i * PHSIZE) != PHSIZE) {
 			warn("Can't read program header data from `%s'", name);
-			(void)close(fd);
+			goto out;
 			return 1;
+		}
 		if (PH(p_type) != PT_NOTE)
 			continue;
 		if (pread(fd, &n, NHSIZE, (off_t)PH(p_offset)) != NHSIZE) {
 			warn("Can't read note header from `%s'", name);
-			(void)close(fd);
+			goto out;
 			return 1;
+		}
 		if (NH(n_type) != ELF_NOTE_TYPE_PAX_TAG ||
 		    NH(n_descsz) != ELF_NOTE_PAX_DESCSZ ||
 		    NH(n_namesz) != ELF_NOTE_PAX_NAMESZ)
 			continue;
 		if (pread(fd, &pax_tag, sizeof(pax_tag), PH(p_offset) + NHSIZE)
 		    != sizeof(pax_tag)) {
 			warn("Can't read pax_tag from `%s'", name);
-			(void)close(fd);
+			goto out;
 			return 1;
+		}
 		if (memcmp(pax_tag.name, ELF_NOTE_PAX_NAME,
 		    sizeof(pax_tag.name)) != 0) {
 			warn("Unknown pax_tag name `%*.*s' from `%s'",
 			    ELF_NOTE_PAX_NAMESZ, ELF_NOTE_PAX_NAMESZ,
 			    pax_tag.name, name);
-			(void)close(fd);
+			goto out;
 			return 1;
+		}
 		ok = 1;
 		if (list) {
 			if (!pax_haveflags(SWAP(pax_tag.flags)))
 				break;
 			if (!pax_flags_sane(SWAP(pax_tag.flags)))
 				warnx("Current flags 0x%x don't make sense",
 				    (uint32_t)SWAP(pax_tag.flags));
 			if (many)
 				(void)printf("%s: ", name);
 			(void)printf("PaX flags:\n");
 			pax_printflags(name, many, SWAP(pax_tag.flags));
 			flagged = 1;
 			break;
+		}
 		pax_tag.flags |= SWAP(add_flags);
 		pax_tag.flags &= SWAP(~del_flags);
 		if (!pax_flags_sane(SWAP(pax_tag.flags))) {
 			warnx("New flags 0x%x don't make sense",
 			    (uint32_t)SWAP(pax_tag.flags));
-			(void)close(fd);
+			goto out;
 			return 1;
+		}
 		if (pwrite(fd, &pax_tag, sizeof(pax_tag),
 		    (off_t)PH(p_offset) + NHSIZE) != sizeof(pax_tag))
 			warn("Can't modify flags on `%s'", name);
 		break;
+	}
 	(void)close(fd);
 	if (!ok) {
 		warnx("Could not find an ELF PaX PT_NOTE section in `%s'",
 		    name);
-		return 1;
+		goto out;
+	}
 	error = 0;
 	if (list && !flagged) {
 		if (many)
 			(void)printf("%s: ", name);
 		(void)printf("No PaX flags.\n");
+	}
-	return 0;
+out:
 	(void)close(fd);
 	return error;
+}
 int
 main(int argc, char **argv)
+{
 	char *opt;
 	int i, list = 0, bad = 0, many, minus;
 	uint32_t add_flags = 0, del_flags = 0;
 	setprogname(argv[0]);
 	if (argc < 2)
 		usage();