Avoid warnings. Detabified.
committer: mfx <mfx> 1131593815 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
+274
-274
@@ -52,28 +52,28 @@
|
|||||||
* sstrip would be useless on such executables.
|
* sstrip would be useless on such executables.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <elf.h>
|
#include <elf.h>
|
||||||
#include <endian.h>
|
#include <endian.h>
|
||||||
#include <byteswap.h>
|
#include <byteswap.h>
|
||||||
|
|
||||||
#ifndef TRUE
|
#ifndef TRUE
|
||||||
#define TRUE 1
|
#define TRUE 1
|
||||||
#define FALSE 0
|
#define FALSE 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The name of the program.
|
/* The name of the program.
|
||||||
*/
|
*/
|
||||||
static char const *progname;
|
static char const *progname;
|
||||||
|
|
||||||
/* The name of the current file.
|
/* The name of the current file.
|
||||||
*/
|
*/
|
||||||
static char const *filename;
|
static char const *filename;
|
||||||
|
|
||||||
|
|
||||||
/* A simple error-handling function. FALSE is always returned for the
|
/* A simple error-handling function. FALSE is always returned for the
|
||||||
@@ -81,8 +81,8 @@ static char const *filename;
|
|||||||
*/
|
*/
|
||||||
static int err(char const *errmsg)
|
static int err(char const *errmsg)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg);
|
fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* A flag to signal the need for endian reversal.
|
/* A flag to signal the need for endian reversal.
|
||||||
@@ -92,50 +92,50 @@ static int do_reverse_endian;
|
|||||||
/* Get a value from the elf header, compensating for endianness.
|
/* Get a value from the elf header, compensating for endianness.
|
||||||
*/
|
*/
|
||||||
#define EGET(X) \
|
#define EGET(X) \
|
||||||
(__extension__ ({ \
|
(__extension__ ({ \
|
||||||
uint64_t __res; \
|
uint64_t __res; \
|
||||||
if (!do_reverse_endian) { \
|
if (!do_reverse_endian) { \
|
||||||
__res = (X); \
|
__res = (X); \
|
||||||
} else if (sizeof(X) == 1) { \
|
} else if (sizeof(X) == 1) { \
|
||||||
__res = (X); \
|
__res = (X); \
|
||||||
} else if (sizeof(X) == 2) { \
|
} else if (sizeof(X) == 2) { \
|
||||||
__res = bswap_16((X)); \
|
__res = bswap_16((X)); \
|
||||||
} else if (sizeof(X) == 4) { \
|
} else if (sizeof(X) == 4) { \
|
||||||
__res = bswap_32((X)); \
|
__res = bswap_32((X)); \
|
||||||
} else if (sizeof(X) == 8) { \
|
} else if (sizeof(X) == 8) { \
|
||||||
__res = bswap_64((X)); \
|
__res = bswap_64((X)); \
|
||||||
} else { \
|
} else { \
|
||||||
fprintf(stderr, "%s: %s: EGET failed for size %d\n", \
|
fprintf(stderr, "%s: %s: EGET failed for size %ld\n", \
|
||||||
progname, filename, sizeof(X)); \
|
progname, filename, (long) sizeof(X)); \
|
||||||
exit(EXIT_FAILURE); \
|
exit(EXIT_FAILURE); \
|
||||||
} \
|
} \
|
||||||
__res; \
|
__res; \
|
||||||
}))
|
}))
|
||||||
|
|
||||||
/* Set a value 'Y' in the elf header to 'X', compensating for endianness.
|
/* Set a value 'Y' in the elf header to 'X', compensating for endianness.
|
||||||
*/
|
*/
|
||||||
#define ESET(Y,X) \
|
#define ESET(Y,X) \
|
||||||
do if (!do_reverse_endian) { \
|
do if (!do_reverse_endian) { \
|
||||||
Y = (X); \
|
Y = (X); \
|
||||||
} else if (sizeof(Y) == 1) { \
|
} else if (sizeof(Y) == 1) { \
|
||||||
Y = (X); \
|
Y = (X); \
|
||||||
} else if (sizeof(Y) == 2) { \
|
} else if (sizeof(Y) == 2) { \
|
||||||
Y = bswap_16((uint16_t)(X)); \
|
Y = bswap_16((uint16_t)(X)); \
|
||||||
} else if (sizeof(Y) == 4) { \
|
} else if (sizeof(Y) == 4) { \
|
||||||
Y = bswap_32((uint32_t)(X)); \
|
Y = bswap_32((uint32_t)(X)); \
|
||||||
} else if (sizeof(Y) == 8) { \
|
} else if (sizeof(Y) == 8) { \
|
||||||
Y = bswap_64((uint64_t)(X)); \
|
Y = bswap_64((uint64_t)(X)); \
|
||||||
} else { \
|
} else { \
|
||||||
fprintf(stderr, "%s: %s: ESET failed for size %d\n", \
|
fprintf(stderr, "%s: %s: ESET failed for size %ld\n", \
|
||||||
progname, filename, sizeof(Y)); \
|
progname, filename, (long) sizeof(Y)); \
|
||||||
exit(EXIT_FAILURE); \
|
exit(EXIT_FAILURE); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
/* A macro for I/O errors: The given error message is used only when
|
/* A macro for I/O errors: The given error message is used only when
|
||||||
* errno is not set.
|
* errno is not set.
|
||||||
*/
|
*/
|
||||||
#define ferr(msg) (err(errno ? strerror(errno) : (msg)))
|
#define ferr(msg) (err(errno ? strerror(errno) : (msg)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -147,45 +147,45 @@ static int do_reverse_endian;
|
|||||||
*/ \
|
*/ \
|
||||||
static int readelfheader ## CLASS (int fd, Elf ## CLASS ## _Ehdr *ehdr) \
|
static int readelfheader ## CLASS (int fd, Elf ## CLASS ## _Ehdr *ehdr) \
|
||||||
{ \
|
{ \
|
||||||
if (read(fd, ((char *)ehdr)+EI_NIDENT, sizeof(*ehdr) - EI_NIDENT) \
|
if (read(fd, ((char *)ehdr)+EI_NIDENT, sizeof(*ehdr) - EI_NIDENT) \
|
||||||
!= sizeof(*ehdr) - EI_NIDENT) \
|
!= (ssize_t)sizeof(*ehdr) - EI_NIDENT) \
|
||||||
return ferr("missing or incomplete ELF header."); \
|
return ferr("missing or incomplete ELF header."); \
|
||||||
\
|
\
|
||||||
/* Verify the sizes of the ELF header and the program segment \
|
/* Verify the sizes of the ELF header and the program segment \
|
||||||
* header table entries. \
|
* header table entries. \
|
||||||
*/ \
|
*/ \
|
||||||
if (EGET(ehdr->e_ehsize) != sizeof(Elf ## CLASS ## _Ehdr)) \
|
if (EGET(ehdr->e_ehsize) != sizeof(Elf ## CLASS ## _Ehdr)) \
|
||||||
return err("unrecognized ELF header size."); \
|
return err("unrecognized ELF header size."); \
|
||||||
if (EGET(ehdr->e_phentsize) != sizeof(Elf ## CLASS ## _Phdr)) \
|
if (EGET(ehdr->e_phentsize) != sizeof(Elf ## CLASS ## _Phdr)) \
|
||||||
return err("unrecognized program segment header size."); \
|
return err("unrecognized program segment header size."); \
|
||||||
\
|
\
|
||||||
/* Finally, check the file type. \
|
/* Finally, check the file type. \
|
||||||
*/ \
|
*/ \
|
||||||
if (EGET(ehdr->e_type) != ET_EXEC && EGET(ehdr->e_type) != ET_DYN) \
|
if (EGET(ehdr->e_type) != ET_EXEC && EGET(ehdr->e_type) != ET_DYN) \
|
||||||
return err("not an executable or shared-object library."); \
|
return err("not an executable or shared-object library."); \
|
||||||
\
|
\
|
||||||
return TRUE; \
|
return TRUE; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* readphdrtable() loads the program segment header table into memory. \
|
/* readphdrtable() loads the program segment header table into memory. \
|
||||||
*/ \
|
*/ \
|
||||||
static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
||||||
Elf ## CLASS ## _Phdr **phdrs) \
|
Elf ## CLASS ## _Phdr **phdrs) \
|
||||||
{ \
|
{ \
|
||||||
size_t size; \
|
size_t size; \
|
||||||
\
|
\
|
||||||
if (!EGET(ehdr->e_phoff) || !EGET(ehdr->e_phnum) \
|
if (!EGET(ehdr->e_phoff) || !EGET(ehdr->e_phnum) \
|
||||||
) return err("ELF file has no program header table."); \
|
) return err("ELF file has no program header table."); \
|
||||||
\
|
\
|
||||||
size = EGET(ehdr->e_phnum) * sizeof **phdrs; \
|
size = EGET(ehdr->e_phnum) * sizeof **phdrs; \
|
||||||
if (!(*phdrs = malloc(size))) \
|
if (!(*phdrs = malloc(size))) \
|
||||||
return err("Out of memory!"); \
|
return err("Out of memory!"); \
|
||||||
\
|
\
|
||||||
errno = 0; \
|
errno = 0; \
|
||||||
if (read(fd, *phdrs, size) != (ssize_t)size) \
|
if (read(fd, *phdrs, size) != (ssize_t)size) \
|
||||||
return ferr("missing or incomplete program segment header table."); \
|
return ferr("missing or incomplete program segment header table."); \
|
||||||
\
|
\
|
||||||
return TRUE; \
|
return TRUE; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* getmemorysize() determines the offset of the last byte of the file \
|
/* getmemorysize() determines the offset of the last byte of the file \
|
||||||
@@ -194,33 +194,33 @@ static int readphdrtable ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
|||||||
* is executing, and thus can be safely discarded.) \
|
* is executing, and thus can be safely discarded.) \
|
||||||
*/ \
|
*/ \
|
||||||
static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \
|
static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \
|
||||||
Elf ## CLASS ## _Phdr const *phdrs, \
|
Elf ## CLASS ## _Phdr const *phdrs, \
|
||||||
unsigned long *newsize) \
|
unsigned long *newsize) \
|
||||||
{ \
|
{ \
|
||||||
Elf ## CLASS ## _Phdr const *phdr; \
|
Elf ## CLASS ## _Phdr const *phdr; \
|
||||||
unsigned long size, n; \
|
unsigned long size, n; \
|
||||||
int i; \
|
size_t i; \
|
||||||
\
|
\
|
||||||
/* Start by setting the size to include the ELF header and the \
|
/* Start by setting the size to include the ELF header and the \
|
||||||
* complete program segment header table. \
|
* complete program segment header table. \
|
||||||
*/ \
|
*/ \
|
||||||
size = EGET(ehdr->e_phoff) + EGET(ehdr->e_phnum) * sizeof *phdrs; \
|
size = EGET(ehdr->e_phoff) + EGET(ehdr->e_phnum) * sizeof *phdrs; \
|
||||||
if (size < sizeof *ehdr) \
|
if (size < sizeof *ehdr) \
|
||||||
size = sizeof *ehdr; \
|
size = sizeof *ehdr; \
|
||||||
\
|
\
|
||||||
/* Then keep extending the size to include whatever data the \
|
/* Then keep extending the size to include whatever data the \
|
||||||
* program segment header table references. \
|
* program segment header table references. \
|
||||||
*/ \
|
*/ \
|
||||||
for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
|
for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
|
||||||
if (EGET(phdr->p_type) != PT_NULL) { \
|
if (EGET(phdr->p_type) != PT_NULL) { \
|
||||||
n = EGET(phdr->p_offset) + EGET(phdr->p_filesz); \
|
n = EGET(phdr->p_offset) + EGET(phdr->p_filesz); \
|
||||||
if (n > size) \
|
if (n > size) \
|
||||||
size = n; \
|
size = n; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
*newsize = size; \
|
*newsize = size; \
|
||||||
return TRUE; \
|
return TRUE; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* modifyheaders() removes references to the section header table if \
|
/* modifyheaders() removes references to the section header table if \
|
||||||
@@ -228,85 +228,85 @@ static int getmemorysize ## CLASS (Elf ## CLASS ## _Ehdr const *ehdr, \
|
|||||||
* included truncated bytes at the end of the file. \
|
* included truncated bytes at the end of the file. \
|
||||||
*/ \
|
*/ \
|
||||||
static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \
|
static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \
|
||||||
Elf ## CLASS ## _Phdr *phdrs, \
|
Elf ## CLASS ## _Phdr *phdrs, \
|
||||||
unsigned long newsize) \
|
unsigned long newsize) \
|
||||||
{ \
|
{ \
|
||||||
Elf ## CLASS ## _Phdr *phdr; \
|
Elf ## CLASS ## _Phdr *phdr; \
|
||||||
int i; \
|
size_t i; \
|
||||||
\
|
\
|
||||||
/* If the section header table is gone, then remove all references \
|
/* If the section header table is gone, then remove all references \
|
||||||
* to it in the ELF header. \
|
* to it in the ELF header. \
|
||||||
*/ \
|
*/ \
|
||||||
if (EGET(ehdr->e_shoff) >= newsize) { \
|
if (EGET(ehdr->e_shoff) >= newsize) { \
|
||||||
ESET(ehdr->e_shoff,0); \
|
ESET(ehdr->e_shoff,0); \
|
||||||
ESET(ehdr->e_shnum,0); \
|
ESET(ehdr->e_shnum,0); \
|
||||||
ESET(ehdr->e_shentsize,0); \
|
ESET(ehdr->e_shentsize,0); \
|
||||||
ESET(ehdr->e_shstrndx,0); \
|
ESET(ehdr->e_shstrndx,0); \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* The program adjusts the file size of any segment that was \
|
/* The program adjusts the file size of any segment that was \
|
||||||
* truncated. The case of a segment being completely stripped out \
|
* truncated. The case of a segment being completely stripped out \
|
||||||
* is handled separately. \
|
* is handled separately. \
|
||||||
*/ \
|
*/ \
|
||||||
for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
|
for (i = 0, phdr = phdrs ; i < EGET(ehdr->e_phnum) ; ++i, ++phdr) { \
|
||||||
if (EGET(phdr->p_offset) >= newsize) { \
|
if (EGET(phdr->p_offset) >= newsize) { \
|
||||||
ESET(phdr->p_offset,newsize); \
|
ESET(phdr->p_offset,newsize); \
|
||||||
ESET(phdr->p_filesz,0); \
|
ESET(phdr->p_filesz,0); \
|
||||||
} else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \
|
} else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \
|
||||||
newsize -= EGET(phdr->p_offset); \
|
newsize -= EGET(phdr->p_offset); \
|
||||||
ESET(phdr->p_filesz, newsize); \
|
ESET(phdr->p_filesz, newsize); \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
return TRUE; \
|
return TRUE; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* commitchanges() writes the new headers back to the original file \
|
/* commitchanges() writes the new headers back to the original file \
|
||||||
* and sets the file to its new size. \
|
* and sets the file to its new size. \
|
||||||
*/ \
|
*/ \
|
||||||
static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
||||||
Elf ## CLASS ## _Phdr *phdrs, \
|
Elf ## CLASS ## _Phdr *phdrs, \
|
||||||
unsigned long newsize) \
|
unsigned long newsize) \
|
||||||
{ \
|
{ \
|
||||||
size_t n; \
|
size_t n; \
|
||||||
\
|
\
|
||||||
/* Save the changes to the ELF header, if any. \
|
/* Save the changes to the ELF header, if any. \
|
||||||
*/ \
|
*/ \
|
||||||
if (lseek(fd, 0, SEEK_SET)) \
|
if (lseek(fd, 0, SEEK_SET)) \
|
||||||
return ferr("could not rewind file"); \
|
return ferr("could not rewind file"); \
|
||||||
errno = 0; \
|
errno = 0; \
|
||||||
if (write(fd, ehdr, sizeof *ehdr) != sizeof *ehdr) \
|
if (write(fd, ehdr, sizeof *ehdr) != (ssize_t)sizeof *ehdr) \
|
||||||
return err("could not modify file"); \
|
return err("could not modify file"); \
|
||||||
\
|
\
|
||||||
/* Save the changes to the program segment header table, if any. \
|
/* Save the changes to the program segment header table, if any. \
|
||||||
*/ \
|
*/ \
|
||||||
if (lseek(fd, EGET(ehdr->e_phoff), SEEK_SET) == (off_t)-1) { \
|
if (lseek(fd, EGET(ehdr->e_phoff), SEEK_SET) == (off_t)-1) { \
|
||||||
err("could not seek in file."); \
|
err("could not seek in file."); \
|
||||||
goto warning; \
|
goto warning; \
|
||||||
} \
|
} \
|
||||||
n = EGET(ehdr->e_phnum) * sizeof *phdrs; \
|
n = EGET(ehdr->e_phnum) * sizeof *phdrs; \
|
||||||
if (write(fd, phdrs, n) != (ssize_t)n) { \
|
if (write(fd, phdrs, n) != (ssize_t)n) { \
|
||||||
err("could not write to file"); \
|
err("could not write to file"); \
|
||||||
goto warning; \
|
goto warning; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* Eleventh-hour sanity check: don't truncate before the end of \
|
/* Eleventh-hour sanity check: don't truncate before the end of \
|
||||||
* the program segment header table. \
|
* the program segment header table. \
|
||||||
*/ \
|
*/ \
|
||||||
if (newsize < EGET(ehdr->e_phoff) + n) \
|
if (newsize < EGET(ehdr->e_phoff) + n) \
|
||||||
newsize = EGET(ehdr->e_phoff) + n; \
|
newsize = EGET(ehdr->e_phoff) + n; \
|
||||||
\
|
\
|
||||||
/* Chop off the end of the file. \
|
/* Chop off the end of the file. \
|
||||||
*/ \
|
*/ \
|
||||||
if (ftruncate(fd, newsize)) { \
|
if (ftruncate(fd, newsize)) { \
|
||||||
err("could not resize file"); \
|
err("could not resize file"); \
|
||||||
goto warning; \
|
goto warning; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
return TRUE; \
|
return TRUE; \
|
||||||
\
|
\
|
||||||
warning: \
|
warning: \
|
||||||
return err("ELF file may have been corrupted!"); \
|
return err("ELF file may have been corrupted!"); \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -314,52 +314,52 @@ static int commitchanges ## CLASS (int fd, Elf ## CLASS ## _Ehdr const *ehdr, \
|
|||||||
*/
|
*/
|
||||||
static int readelfheaderident(int fd, Elf32_Ehdr *ehdr)
|
static int readelfheaderident(int fd, Elf32_Ehdr *ehdr)
|
||||||
{
|
{
|
||||||
errno = 0;
|
errno = 0;
|
||||||
if (read(fd, ehdr, EI_NIDENT) != EI_NIDENT)
|
if (read(fd, ehdr, EI_NIDENT) != EI_NIDENT)
|
||||||
return ferr("missing or incomplete ELF header.");
|
return ferr("missing or incomplete ELF header.");
|
||||||
|
|
||||||
/* Check the ELF signature.
|
/* Check the ELF signature.
|
||||||
*/
|
*/
|
||||||
if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 &&
|
if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 &&
|
||||||
ehdr->e_ident[EI_MAG1] == ELFMAG1 &&
|
ehdr->e_ident[EI_MAG1] == ELFMAG1 &&
|
||||||
ehdr->e_ident[EI_MAG2] == ELFMAG2 &&
|
ehdr->e_ident[EI_MAG2] == ELFMAG2 &&
|
||||||
ehdr->e_ident[EI_MAG3] == ELFMAG3))
|
ehdr->e_ident[EI_MAG3] == ELFMAG3))
|
||||||
{
|
{
|
||||||
err("missing ELF signature.");
|
err("missing ELF signature.");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compare the file's class and endianness with the program's.
|
/* Compare the file's class and endianness with the program's.
|
||||||
*/
|
*/
|
||||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||||
if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
|
if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
|
||||||
do_reverse_endian = 0;
|
do_reverse_endian = 0;
|
||||||
} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
|
} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
|
||||||
/* fprintf(stderr, "ELF file has different endianness.\n"); */
|
/* fprintf(stderr, "ELF file has different endianness.\n"); */
|
||||||
do_reverse_endian = 1;
|
do_reverse_endian = 1;
|
||||||
}
|
}
|
||||||
#elif __BYTE_ORDER == __BIG_ENDIAN
|
#elif __BYTE_ORDER == __BIG_ENDIAN
|
||||||
if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
|
if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
|
||||||
/* fprintf(stderr, "ELF file has different endianness.\n"); */
|
/* fprintf(stderr, "ELF file has different endianness.\n"); */
|
||||||
do_reverse_endian = 1;
|
do_reverse_endian = 1;
|
||||||
} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
|
} else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
|
||||||
do_reverse_endian = 0;
|
do_reverse_endian = 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#error unkown endianness
|
#error unkown endianness
|
||||||
#endif
|
#endif
|
||||||
else {
|
else {
|
||||||
err("Unsupported endianness");
|
err("Unsupported endianness");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check the target architecture.
|
/* Check the target architecture.
|
||||||
*/
|
*/
|
||||||
/* if (EGET(ehdr->e_machine) != ELF_ARCH) { */
|
/* if (EGET(ehdr->e_machine) != ELF_ARCH) { */
|
||||||
/* /\* return err("ELF file created for different architecture."); *\/ */
|
/* /\* return err("ELF file created for different architecture."); *\/ */
|
||||||
/* fprintf(stderr, "ELF file created for different architecture.\n"); */
|
/* fprintf(stderr, "ELF file created for different architecture.\n"); */
|
||||||
/* } */
|
/* } */
|
||||||
return ehdr->e_ident[EI_CLASS];
|
return ehdr->e_ident[EI_CLASS];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -373,29 +373,29 @@ HEADER_FUNCTIONS(64)
|
|||||||
*/
|
*/
|
||||||
static int truncatezeros(int fd, unsigned long *newsize)
|
static int truncatezeros(int fd, unsigned long *newsize)
|
||||||
{
|
{
|
||||||
unsigned char contents[1024];
|
unsigned char contents[1024];
|
||||||
unsigned long size, n;
|
unsigned long size, n;
|
||||||
|
|
||||||
size = *newsize;
|
size = *newsize;
|
||||||
do {
|
do {
|
||||||
n = sizeof contents;
|
n = sizeof contents;
|
||||||
if (n > size)
|
if (n > size)
|
||||||
n = size;
|
n = size;
|
||||||
if (lseek(fd, size - n, SEEK_SET) == (off_t)-1)
|
if (lseek(fd, size - n, SEEK_SET) == (off_t)-1)
|
||||||
return ferr("cannot seek in file.");
|
return ferr("cannot seek in file.");
|
||||||
if (read(fd, contents, n) != (ssize_t)n)
|
if (read(fd, contents, n) != (ssize_t)n)
|
||||||
return ferr("cannot read file contents");
|
return ferr("cannot read file contents");
|
||||||
while (n && !contents[--n])
|
while (n && !contents[--n])
|
||||||
--size;
|
--size;
|
||||||
} while (size && !n);
|
} while (size && !n);
|
||||||
|
|
||||||
/* Sanity check.
|
/* Sanity check.
|
||||||
*/
|
*/
|
||||||
if (!size)
|
if (!size)
|
||||||
return err("ELF file is completely blank!");
|
return err("ELF file is completely blank!");
|
||||||
|
|
||||||
*newsize = size;
|
*newsize = size;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* main() loops over the cmdline arguments, leaving all the real work
|
/* main() loops over the cmdline arguments, leaving all the real work
|
||||||
@@ -403,68 +403,68 @@ static int truncatezeros(int fd, unsigned long *newsize)
|
|||||||
*/
|
*/
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
union {
|
union {
|
||||||
Elf32_Ehdr ehdr32;
|
Elf32_Ehdr ehdr32;
|
||||||
Elf64_Ehdr ehdr64;
|
Elf64_Ehdr ehdr64;
|
||||||
} e;
|
} e;
|
||||||
union {
|
union {
|
||||||
Elf32_Phdr *phdrs32;
|
Elf32_Phdr *phdrs32;
|
||||||
Elf64_Phdr *phdrs64;
|
Elf64_Phdr *phdrs64;
|
||||||
} p;
|
} p;
|
||||||
unsigned long newsize;
|
unsigned long newsize;
|
||||||
char **arg;
|
char **arg;
|
||||||
int failures = 0;
|
int failures = 0;
|
||||||
|
|
||||||
if (argc < 2 || argv[1][0] == '-') {
|
if (argc < 2 || argv[1][0] == '-') {
|
||||||
printf("Usage: sstrip FILE...\n"
|
printf("Usage: sstrip FILE...\n"
|
||||||
"sstrip discards all nonessential bytes from an executable.\n\n"
|
"sstrip discards all nonessential bytes from an executable.\n\n"
|
||||||
"Version 2.0-X Copyright (C) 2000,2001 Brian Raiter.\n"
|
"Version 2.0-X Copyright (C) 2000,2001 Brian Raiter.\n"
|
||||||
"Cross-devel hacks Copyright (C) 2004 Manuel Novoa III.\n"
|
"Cross-devel hacks Copyright (C) 2004 Manuel Novoa III.\n"
|
||||||
"This program is free software, licensed under the GNU\n"
|
"This program is free software, licensed under the GNU\n"
|
||||||
"General Public License. There is absolutely no warranty.\n");
|
"General Public License. There is absolutely no warranty.\n");
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
progname = argv[0];
|
progname = argv[0];
|
||||||
|
|
||||||
for (arg = argv + 1 ; *arg != NULL ; ++arg) {
|
for (arg = argv + 1 ; *arg != NULL ; ++arg) {
|
||||||
filename = *arg;
|
filename = *arg;
|
||||||
|
|
||||||
fd = open(*arg, O_RDWR);
|
fd = open(*arg, O_RDWR);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
ferr("can't open");
|
ferr("can't open");
|
||||||
++failures;
|
++failures;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (readelfheaderident(fd, &e.ehdr32)) {
|
switch (readelfheaderident(fd, &e.ehdr32)) {
|
||||||
case ELFCLASS32:
|
case ELFCLASS32:
|
||||||
if (!(readelfheader32(fd, &e.ehdr32) &&
|
if (!(readelfheader32(fd, &e.ehdr32) &&
|
||||||
readphdrtable32(fd, &e.ehdr32, &p.phdrs32) &&
|
readphdrtable32(fd, &e.ehdr32, &p.phdrs32) &&
|
||||||
getmemorysize32(&e.ehdr32, p.phdrs32, &newsize) &&
|
getmemorysize32(&e.ehdr32, p.phdrs32, &newsize) &&
|
||||||
truncatezeros(fd, &newsize) &&
|
truncatezeros(fd, &newsize) &&
|
||||||
modifyheaders32(&e.ehdr32, p.phdrs32, newsize) &&
|
modifyheaders32(&e.ehdr32, p.phdrs32, newsize) &&
|
||||||
commitchanges32(fd, &e.ehdr32, p.phdrs32, newsize)))
|
commitchanges32(fd, &e.ehdr32, p.phdrs32, newsize)))
|
||||||
++failures;
|
++failures;
|
||||||
break;
|
break;
|
||||||
case ELFCLASS64:
|
case ELFCLASS64:
|
||||||
if (!(readelfheader64(fd, &e.ehdr64) &&
|
if (!(readelfheader64(fd, &e.ehdr64) &&
|
||||||
readphdrtable64(fd, &e.ehdr64, &p.phdrs64) &&
|
readphdrtable64(fd, &e.ehdr64, &p.phdrs64) &&
|
||||||
getmemorysize64(&e.ehdr64, p.phdrs64, &newsize) &&
|
getmemorysize64(&e.ehdr64, p.phdrs64, &newsize) &&
|
||||||
truncatezeros(fd, &newsize) &&
|
truncatezeros(fd, &newsize) &&
|
||||||
modifyheaders64(&e.ehdr64, p.phdrs64, newsize) &&
|
modifyheaders64(&e.ehdr64, p.phdrs64, newsize) &&
|
||||||
commitchanges64(fd, &e.ehdr64, p.phdrs64, newsize)))
|
commitchanges64(fd, &e.ehdr64, p.phdrs64, newsize)))
|
||||||
++failures;
|
++failures;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
++failures;
|
++failures;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
return failures ? EXIT_FAILURE : EXIT_SUCCESS;
|
return failures ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user