| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485 |
- Subject: Add PaX note
- Upstream-Author: Christos Zoulas <christos@zoulas.com>
- Date: Fri Sep 20 00:39:43 2013 +0000
- Origin: FILE5_14-67-g9b5bdd7
- Last-Update: 2015-01-05
- (prequisite for TEMP-0000000-B67840)
- diff --git a/src/readelf.c b/src/readelf.c
- index 314adb7..87c19a3 100644
- --- a/src/readelf.c
- +++ b/src/readelf.c
- @@ -471,6 +471,36 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
- *flags |= FLAGS_DID_BUILD_ID;
- }
-
- + if (namesz == 4 && strcmp((char *)&nbuf[noff], "PaX") == 0 &&
- + xnh_type == NT_NETBSD_PAX && descsz == 4) {
- + static const char *pax[] = {
- + "+mprotect",
- + "-mprotect",
- + "+segvguard",
- + "-segvguard",
- + "+ASLR",
- + "-ASLR",
- + };
- + uint32_t desc;
- + size_t i;
- + int did = 0;
- +
- + (void)memcpy(&desc, &nbuf[doff], sizeof(desc));
- + desc = elf_getu32(swap, desc);
- +
- + if (desc && file_printf(ms, ", PaX: ") == -1)
- + return size;
- +
- + for (i = 0; i < __arraycount(pax); i++) {
- + if (((1 << i) & desc) == 0)
- + continue;
- + if (file_printf(ms, "%s%s", did++ ? "," : "",
- + pax[i]) == -1)
- + return size;
- + }
- + *flags |= FLAGS_DID_BUILD_ID;
- + }
- +
- if (namesz == 7 && strcmp((char *)&nbuf[noff], "NetBSD") == 0 &&
- xnh_type == NT_NETBSD_VERSION && descsz == 4) {
- uint32_t desc;
- @@ -687,6 +717,7 @@ core:
-
- default:
- if (xnh_type == NT_PRPSINFO && *flags & FLAGS_IS_CORE) {
- +/*###709 [cc] warning: declaration of 'i' shadows previous non-variable%%%*/
- size_t i, j;
- unsigned char c;
- /*
- diff --git a/src/readelf.h b/src/readelf.h
- index 4308e6a..df6955c 100644
- --- a/src/readelf.h
- +++ b/src/readelf.h
- @@ -263,6 +263,23 @@ typedef struct {
- */
- #define NT_GNU_BUILD_ID 3
-
- +/*
- + * NetBSD-specific note type: PaX.
- + * There should be 1 NOTE per executable.
- + * name: PaX\0
- + * namesz: 4
- + * desc:
- + * word[0]: capability bitmask
- + * descsz: 4
- + */
- +#define NT_NETBSD_PAX 3
- +#define NT_NETBSD_PAX_MPROTECT 0x01 /* Force enable Mprotect */
- +#define NT_NETBSD_PAX_NOMPROTECT 0x02 /* Force disable Mprotect */
- +#define NT_NETBSD_PAX_GUARD 0x04 /* Force enable Segvguard */
- +#define NT_NETBSD_PAX_NOGUARD 0x08 /* Force disable Servguard */
- +#define NT_NETBSD_PAX_ASLR 0x10 /* Force enable ASLR */
- +#define NT_NETBSD_PAX_NOASLR 0x20 /* Force disable ASLR */
- +
- /* SunOS 5.x hardware/software capabilities */
- typedef struct {
- Elf32_Word c_tag;
|
