Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turn paxctl into a tool. pass lint.

This commit is contained in:
christos 2006-11-10 16:31:58 +00:00
parent 5a595b5295
commit 4dec970d46
1 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
usr.bin/paxctl/paxctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: paxctl.c,v 1.3 2006/09/27 20:01:50 elad Exp $ */
/* $NetBSD: paxctl.c,v 1.4 2006/11/10 16:31:58 christos Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
@ -29,6 +29,14 @@
* (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
__RCSID("$NetBSD: paxctl.c,v 1.4 2006/11/10 16:31:58 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <machine/elf_machdep.h>
@ -42,76 +50,79 @@
#include <stdlib.h>
#include <string.h>
void usage(void);
int pax_flag(char *);
int pax_flags_sane(int);
int pax_haveflags(int);
void pax_printflags(int);
static void usage(void) __attribute__((__noreturn__));
static int pax_flag(const char *);
static int pax_flags_sane(u_long);
static int pax_haveflags(u_long);
static void pax_printflags(u_long);
struct paxflag {
static const struct paxflag {
char mark;
char *name;
const char *name;
int bits;
} flags[] = {
{ 'M', "mprotect(2) restrictions, explicit enable", PF_PAXMPROTECT },
{ 'm', "mprotect(2) restrictions, explicit disable", PF_PAXNOMPROTECT },
};
void
static void
usage(void)
{
errx(1, "Usage: %s [ <-|+>m | <-|+>M ] <file>", getprogname());
(void)fprintf(stderr, "Usage: %s [ <-|+>m | <-|+>M ] <file>\n",
getprogname());
exit(1);
}
int
pax_flag(char *s)
static int
pax_flag(const char *s)
{
int i;
size_t i;
if (*s == '\0' || !(*(s + 1) == '\0'))
return (-1);
if (s[0] == '\0' || s[1] != '\0')
return -1;
for (i = 0; i < sizeof(flags)/sizeof(flags[0]); i++)
for (i = 0; i < __arraycount(flags); i++)
if (*s == flags[i].mark)
return (flags[i].bits);
return flags[i].bits;
return (-1);
return -1;
}
int
pax_flags_sane(int f)
static int
pax_flags_sane(u_long f)
{
int i;
size_t i;
for (i = 0; i < sizeof(flags)/sizeof(flags[0]); i += 2)
if ((f & (flags[i].bits|flags[i+1].bits)) ==
(flags[i].bits|flags[i+1].bits))
return (0);
for (i = 0; i < __arraycount(flags) - 1; i += 2) {
int g = flags[i].bits | flags[i+1].bits;
if ((f & g) == g)
return 0;
}
return (1);
return 1;
}
int
pax_haveflags(int f)
static int
pax_haveflags(u_long f)
{
int i;
size_t i;
for (i = 0; i < sizeof(flags)/sizeof(flags[0]); i++)
for (i = 0; i < __arraycount(flags); i++)
if (f & flags[i].bits)
return (1);
return (0);
}
void
pax_printflags(int f)
static void
pax_printflags(u_long f)
{
int i;
size_t i;
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
for (i = 0; i < __arraycount(flags); i++)
if (f & flags[i].bits)
printf(" %c: %s\n", flags[i].mark, flags[i].name);
}
(void)printf(" %c: %s\n",
flags[i].mark, flags[i].name);
}
int
@ -157,62 +168,64 @@ main(int argc, char **argv)
fd = open(opt, O_RDWR, 0);
if (fd == -1) {
if (!list || (fd = open(opt, O_RDONLY, 0)) == -1)
err(1, "Can't open `%s'", opt);
err(EXIT_FAILURE, "Can't open `%s'", opt);
}
if (read(fd, &eh, sizeof(eh)) != sizeof(eh))
err(1, "Can't read ELF header from `%s'", opt);
err(EXIT_FAILURE, "Can't read ELF header from `%s'", opt);
if (memcmp(eh.e_ident, ELFMAG, SELFMAG) != 0)
errx(1, "Bad ELF magic from `%s' (maybe it's not an ELF?)",
opt);
errx(EXIT_FAILURE,
"Bad ELF magic from `%s' (maybe it's not an ELF?)", opt);
for (i = 0; i < eh.e_phnum; i++) {
if (pread(fd, &ph, sizeof(ph),
eh.e_phoff + i * sizeof(ph)) != sizeof(ph))
err(1, "Can't read data from `%s'", opt);
err(EXIT_FAILURE, "Can't read data from `%s'", opt);
if (ph.p_type == PT_NOTE) {
ok = 1;
if (ph.p_type != PT_NOTE)
continue;
if (list) {
if (!pax_haveflags(ph.p_flags))
break;
if (!pax_flags_sane(ph.p_flags))
warnx("Flags don't make sense");
(void)printf("PaX flags:\n");
pax_printflags(ph.p_flags);
flagged = 1;
ok = 1;
if (list) {
if (!pax_haveflags((u_long)ph.p_flags))
break;
}
ph.p_flags |= add_flags;
ph.p_flags &= ~del_flags;
if (!pax_flags_sane((u_long)ph.p_flags))
warnx("Current flags %lx don't make sense",
(u_long)ph.p_flags);
if (!pax_flags_sane(ph.p_flags))
errx(1, "New flags don't make sense");
(void)printf("PaX flags:\n");
if (pwrite(fd, &ph, sizeof(ph),
eh.e_phoff + i * sizeof(ph)) != sizeof(ph))
err(1, "Can't modify flags on `%s'", opt);
pax_printflags((u_long)ph.p_flags);
flagged = 1;
break;
}
ph.p_flags |= add_flags;
ph.p_flags &= ~del_flags;
if (!pax_flags_sane((u_long)ph.p_flags))
errx(EXIT_FAILURE, "New flags %lx don't make sense",
(u_long)ph.p_flags);
if (pwrite(fd, &ph, sizeof(ph),
eh.e_phoff + i * sizeof(ph)) != sizeof(ph))
err(EXIT_FAILURE, "Can't modify flags on `%s'", opt);
break;
}
if (!ok)
errx(1, "Could not find an ELF PT_NOTE section in `%s'",
opt);
if (list && !flagged)
(void)printf("No PaX flags.\n");
(void)close(fd);
return (0);
if (!ok)
errx(EXIT_FAILURE,
"Could not find an ELF PT_NOTE section in `%s'", opt);
if (list && !flagged)
(void)printf("No PaX flags.\n");
return 0;
}