1 files changed, 109 insertions, 98 deletions

diff --git a/arch/ppc64/boot/addRamDisk.c b/arch/ppc64/boot/addRamDisk.c
index 7f2c09473394..c02a99952be7 100644
--- a/arch/ppc64/boot/addRamDisk.c
+++ b/arch/ppc64/boot/addRamDisk.c
@@ -5,11 +5,59 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <elf.h>
 
 #define ElfHeaderSize  (64 * 1024)
 #define ElfPages  (ElfHeaderSize / 4096)
 #define KERNELBASE (0xc000000000000000)
+#define _ALIGN_UP(addr,size)    (((addr)+((size)-1))&(~((size)-1)))
 
+struct addr_range {
+        unsigned long long addr;
+        unsigned long memsize;
+        unsigned long offset;
+};
+
+static int check_elf64(void *p, int size, struct addr_range *r)
+{
+        Elf64_Ehdr *elf64 = p;
+        Elf64_Phdr *elf64ph;
+
+        if (elf64->e_ident[EI_MAG0] != ELFMAG0 ||
+            elf64->e_ident[EI_MAG1] != ELFMAG1 ||
+            elf64->e_ident[EI_MAG2] != ELFMAG2 ||
+            elf64->e_ident[EI_MAG3] != ELFMAG3 ||
+            elf64->e_ident[EI_CLASS] != ELFCLASS64 ||
+            elf64->e_ident[EI_DATA] != ELFDATA2MSB ||
+            elf64->e_type != ET_EXEC || elf64->e_machine != EM_PPC64)
+                return 0;
+
+        if ((elf64->e_phoff + sizeof(Elf64_Phdr)) > size)
+                return 0;
+
+        elf64ph = (Elf64_Phdr *) ((unsigned long)elf64 +
+                                  (unsigned long)elf64->e_phoff);
+
+        r->memsize = (unsigned long)elf64ph->p_memsz;
+        r->offset = (unsigned long)elf64ph->p_offset;
+        r->addr = (unsigned long long)elf64ph->p_vaddr;
+
+#ifdef DEBUG
+        printf("PPC64 ELF file, ph:\n");
+        printf("p_type   0x%08x\n", elf64ph->p_type);
+        printf("p_flags  0x%08x\n", elf64ph->p_flags);
+        printf("p_offset 0x%016llx\n", elf64ph->p_offset);
+        printf("p_vaddr  0x%016llx\n", elf64ph->p_vaddr);
+        printf("p_paddr  0x%016llx\n", elf64ph->p_paddr);
+        printf("p_filesz 0x%016llx\n", elf64ph->p_filesz);
+        printf("p_memsz  0x%016llx\n", elf64ph->p_memsz);
+        printf("p_align  0x%016llx\n", elf64ph->p_align);
+        printf("... skipping 0x%08lx bytes of ELF header\n",
+               (unsigned long)elf64ph->p_offset);
+#endif
+
+        return 64;
+}
 void get4k(FILE *file, char *buf )
 {
         unsigned j;
@@ -34,97 +82,92 @@ void death(const char *msg, FILE *fdesc, const char *fname)
 int main(int argc, char **argv)
 {
         char inbuf[4096];
-        FILE *ramDisk = NULL;
-        FILE *sysmap = NULL;
-        FILE *inputVmlinux = NULL;
-        FILE *outputVmlinux = NULL;
-  
-        unsigned i = 0;
-        unsigned long ramFileLen = 0;
-        unsigned long ramLen = 0;
-        unsigned long roundR = 0;
-  
-        unsigned long sysmapFileLen = 0;
-        unsigned long sysmapLen = 0;
-        unsigned long sysmapPages = 0;
-        char* ptr_end = NULL; 
-        unsigned long offset_end = 0;
-
-        unsigned long kernelLen = 0;
-        unsigned long actualKernelLen = 0;
-        unsigned long round = 0;
-        unsigned long roundedKernelLen = 0;
-        unsigned long ramStartOffs = 0;
-        unsigned long ramPages = 0;
-        unsigned long roundedKernelPages = 0;
-        unsigned long hvReleaseData = 0;
+        struct addr_range vmlinux;
+        FILE *ramDisk;
+        FILE *inputVmlinux;
+        FILE *outputVmlinux;
+
+        char *rd_name, *lx_name, *out_name;
+
+        size_t i;
+        unsigned long ramFileLen;
+        unsigned long ramLen;
+        unsigned long roundR;
+        unsigned long offset_end;
+
+        unsigned long kernelLen;
+        unsigned long actualKernelLen;
+        unsigned long round;
+        unsigned long roundedKernelLen;
+        unsigned long ramStartOffs;
+        unsigned long ramPages;
+        unsigned long roundedKernelPages;
+        unsigned long hvReleaseData;
         u_int32_t eyeCatcher = 0xc8a5d9c4;
-        unsigned long naca = 0;
-        unsigned long xRamDisk = 0;
-        unsigned long xRamDiskSize = 0;
-        long padPages = 0;
+        unsigned long naca;
+        unsigned long xRamDisk;
+        unsigned long xRamDiskSize;
+        long padPages;
   
   
         if (argc < 2) {
                 fprintf(stderr, "Name of RAM disk file missing.\n");
                 exit(1);
         }
+        rd_name = argv[1];
 
         if (argc < 3) {
-                fprintf(stderr, "Name of System Map input file is missing.\n");
-                exit(1);
-        }
-  
-        if (argc < 4) {
                 fprintf(stderr, "Name of vmlinux file missing.\n");
                 exit(1);
         }
+        lx_name = argv[2];
 
-        if (argc < 5) {
+        if (argc < 4) {
                 fprintf(stderr, "Name of vmlinux output file missing.\n");
                 exit(1);
         }
+        out_name = argv[3];
 
 
-        ramDisk = fopen(argv[1], "r");
+        ramDisk = fopen(rd_name, "r");
         if ( ! ramDisk ) {
-                fprintf(stderr, "RAM disk file \"%s\" failed to open.\n", argv[1]);
+                fprintf(stderr, "RAM disk file \"%s\" failed to open.\n", rd_name);
                 exit(1);
         }
 
-        sysmap = fopen(argv[2], "r");
-        if ( ! sysmap ) {
-                fprintf(stderr, "System Map file \"%s\" failed to open.\n", argv[2]);
-                exit(1);
-        }
-  
-        inputVmlinux = fopen(argv[3], "r");
+        inputVmlinux = fopen(lx_name, "r");
         if ( ! inputVmlinux ) {
-                fprintf(stderr, "vmlinux file \"%s\" failed to open.\n", argv[3]);
+                fprintf(stderr, "vmlinux file \"%s\" failed to open.\n", lx_name);
                 exit(1);
         }
   
-        outputVmlinux = fopen(argv[4], "w+");
+        outputVmlinux = fopen(out_name, "w+");
         if ( ! outputVmlinux ) {
-                fprintf(stderr, "output vmlinux file \"%s\" failed to open.\n", argv[4]);
+                fprintf(stderr, "output vmlinux file \"%s\" failed to open.\n", out_name);
                 exit(1);
         }
-  
-  
-  
+
+        i = fread(inbuf, 1, sizeof(inbuf), inputVmlinux);
+        if (i != sizeof(inbuf)) {
+                fprintf(stderr, "can not read vmlinux file %s: %u\n", lx_name, i);
+                exit(1);
+        }
+
+        i = check_elf64(inbuf, sizeof(inbuf), &vmlinux);
+        if (i == 0) {
+                fprintf(stderr, "You must have a linux kernel specified as argv[2]\n");
+                exit(1);
+        }
+
         /* Input Vmlinux file */
         fseek(inputVmlinux, 0, SEEK_END);
         kernelLen = ftell(inputVmlinux);
         fseek(inputVmlinux, 0, SEEK_SET);
-        printf("kernel file size = %d\n", kernelLen);
-        if ( kernelLen == 0 ) {
-                fprintf(stderr, "You must have a linux kernel specified as argv[3]\n");
-                exit(1);
-        }
+        printf("kernel file size = %lu\n", kernelLen);
 
         actualKernelLen = kernelLen - ElfHeaderSize;
 
-        printf("actual kernel length (minus ELF header) = %d\n", actualKernelLen);
+        printf("actual kernel length (minus ELF header) = %lu\n", actualKernelLen);
 
         round = actualKernelLen % 4096;
         roundedKernelLen = actualKernelLen;
@@ -134,39 +177,7 @@ int main(int argc, char **argv)
         roundedKernelPages = roundedKernelLen / 4096;
         printf("Vmlinux pages to copy = %ld/0x%lx \n", roundedKernelPages, roundedKernelPages);
 
-
-
-        /* Input System Map file */
-        /* (needs to be processed simply to determine if we need to add pad pages due to the static variables not being included in the vmlinux) */
-        fseek(sysmap, 0, SEEK_END);
-        sysmapFileLen = ftell(sysmap);
-        fseek(sysmap, 0, SEEK_SET);
-        printf("%s file size = %ld/0x%lx \n", argv[2], sysmapFileLen, sysmapFileLen);
-
-        sysmapLen = sysmapFileLen;
-
-        roundR = 4096 - (sysmapLen % 4096);
-        if (roundR) {
-                printf("Rounding System Map file up to a multiple of 4096, adding %ld/0x%lx \n", roundR, roundR);
-                sysmapLen += roundR;
-        }
-        printf("Rounded System Map size is %ld/0x%lx \n", sysmapLen, sysmapLen);
-  
-        /* Process the Sysmap file to determine where _end is */
-        sysmapPages = sysmapLen / 4096;
-        /* read the whole file line by line, expect that it doesn't fail */
-        while ( fgets(inbuf, 4096, sysmap) )  ;
-        /* search for _end in the last page of the system map */
-        ptr_end = strstr(inbuf, " _end");
-        if (!ptr_end) {
-                fprintf(stderr, "Unable to find _end in the sysmap file \n");
-                fprintf(stderr, "inbuf: \n");
-                fprintf(stderr, "%s \n", inbuf);
-                exit(1);
-        }
-        printf("Found _end in the last page of the sysmap - backing up 10 characters it looks like %s", ptr_end-10);
-        /* convert address of _end in system map to hex offset. */
-        offset_end = (unsigned int)strtol(ptr_end-10, NULL, 16);
+        offset_end = _ALIGN_UP(vmlinux.memsize, 4096);
         /* calc how many pages we need to insert between the vmlinux and the start of the ram disk */
         padPages = offset_end/4096 - roundedKernelPages;
 
@@ -194,7 +205,7 @@ int main(int argc, char **argv)
         fseek(ramDisk, 0, SEEK_END);
         ramFileLen = ftell(ramDisk);
         fseek(ramDisk, 0, SEEK_SET);
-        printf("%s file size = %ld/0x%lx \n", argv[1], ramFileLen, ramFileLen);
+        printf("%s file size = %ld/0x%lx \n", rd_name, ramFileLen, ramFileLen);
 
         ramLen = ramFileLen;
 
@@ -248,19 +259,19 @@ int main(int argc, char **argv)
         /* fseek to the hvReleaseData pointer */
         fseek(outputVmlinux, ElfHeaderSize + 0x24, SEEK_SET);
         if (fread(&hvReleaseData, 4, 1, outputVmlinux) != 1) {
-                death("Could not read hvReleaseData pointer\n", outputVmlinux, argv[4]);
+                death("Could not read hvReleaseData pointer\n", outputVmlinux, out_name);
         }
         hvReleaseData = ntohl(hvReleaseData); /* Convert to native int */
-        printf("hvReleaseData is at %08x\n", hvReleaseData);
+        printf("hvReleaseData is at %08lx\n", hvReleaseData);
 
         /* fseek to the hvReleaseData */
         fseek(outputVmlinux, ElfHeaderSize + hvReleaseData, SEEK_SET);
         if (fread(inbuf, 0x40, 1, outputVmlinux) != 1) {
-                death("Could not read hvReleaseData\n", outputVmlinux, argv[4]);
+                death("Could not read hvReleaseData\n", outputVmlinux, out_name);
         }
         /* Check hvReleaseData sanity */
         if (memcmp(inbuf, &eyeCatcher, 4) != 0) {
-                death("hvReleaseData is invalid\n", outputVmlinux, argv[4]);
+                death("hvReleaseData is invalid\n", outputVmlinux, out_name);
         }
         /* Get the naca pointer */
         naca = ntohl(*((u_int32_t*) &inbuf[0x0C])) - KERNELBASE;
@@ -269,13 +280,13 @@ int main(int argc, char **argv)
         /* fseek to the naca */
         fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
         if (fread(inbuf, 0x18, 1, outputVmlinux) != 1) {
-                death("Could not read naca\n", outputVmlinux, argv[4]);
+                death("Could not read naca\n", outputVmlinux, out_name);
         }
         xRamDisk = ntohl(*((u_int32_t *) &inbuf[0x0c]));
         xRamDiskSize = ntohl(*((u_int32_t *) &inbuf[0x14]));
         /* Make sure a RAM disk isn't already present */
         if ((xRamDisk != 0) || (xRamDiskSize != 0)) {
-                death("RAM disk is already attached to this kernel\n", outputVmlinux, argv[4]);
+                death("RAM disk is already attached to this kernel\n", outputVmlinux, out_name);
         }
         /* Fill in the values */
         *((u_int32_t *) &inbuf[0x0c]) = htonl(ramStartOffs);
@@ -285,15 +296,15 @@ int main(int argc, char **argv)
         fflush(outputVmlinux);
         fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
         if (fwrite(inbuf, 0x18, 1, outputVmlinux) != 1) {
-                death("Could not write naca\n", outputVmlinux, argv[4]);
+                death("Could not write naca\n", outputVmlinux, out_name);
         }
-        printf("Ram Disk of 0x%lx pages is attached to the kernel at offset 0x%08x\n",
+        printf("Ram Disk of 0x%lx pages is attached to the kernel at offset 0x%08lx\n",
                ramPages, ramStartOffs);
 
         /* Done */
         fclose(outputVmlinux);
         /* Set permission to executable */
-        chmod(argv[4], S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
+        chmod(out_name, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
 
         return 0;
 }