2.4.30

 fs

diff -urN linux-2.4.29/fs/binfmt_elf.c linux-2.4.30/fs/binfmt_elf.c
--- linux-2.4.29/fs/binfmt_elf.c   2005-01-19 06:10:10.000000000 -0800
+++ linux-2.4.30/fs/binfmt_elf.c   2005-04-03 18:42:20.042158975 -0700
@@ -926,6 +926,7 @@
 static int load_elf_library(struct file *file)
 {
    struct elf_phdr *elf_phdata;
+   struct elf_phdr *eppnt;
    unsigned long elf_bss, bss, len;
    int retval, error, i, j;
    struct elfhdr elf_ex;
@@ -949,41 +950,43 @@
    /* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */
 
    error = -ENOMEM;
-   elf_phdata = (struct elf_phdr *) kmalloc(j, GFP_KERNEL);
+   elf_phdata = kmalloc(j, GFP_KERNEL);
    if (!elf_phdata)
       goto out;
 
+   eppnt = elf_phdata;
    error = -ENOEXEC;
-   retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata, j);
+   retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j);
    if (retval != j)
       goto out_free_ph;
 
    for (j = 0, i = 0; i<elf_ex.e_phnum; i++)
-      if ((elf_phdata + i)->p_type == PT_LOAD) j++;
+      if ((eppnt + i)->p_type == PT_LOAD) j++;
    if (j != 1)
       goto out_free_ph;
 
-   while (elf_phdata->p_type != PT_LOAD) elf_phdata++;
+   while (eppnt->p_type != PT_LOAD) 
+      eppnt++;
 
    /* Now use mmap to map the library into memory. */
    down_write(¤t->mm->mmap_sem);
    error = do_mmap(file,
-         ELF_PAGESTART(elf_phdata->p_vaddr),
-         (elf_phdata->p_filesz +
-          ELF_PAGEOFFSET(elf_phdata->p_vaddr)),
+         ELF_PAGESTART(eppnt->p_vaddr),
+         (eppnt->p_filesz +
+          ELF_PAGEOFFSET(eppnt->p_vaddr)),
          PROT_READ | PROT_WRITE | PROT_EXEC,
          MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
-         (elf_phdata->p_offset -
-          ELF_PAGEOFFSET(elf_phdata->p_vaddr)));
+         (eppnt->p_offset -
+          ELF_PAGEOFFSET(eppnt->p_vaddr)));
    up_write(¤t->mm->mmap_sem);
-   if (error != ELF_PAGESTART(elf_phdata->p_vaddr))
+   if (error != ELF_PAGESTART(eppnt->p_vaddr))
       goto out_free_ph;
 
-   elf_bss = elf_phdata->p_vaddr + elf_phdata->p_filesz;
+   elf_bss = eppnt->p_vaddr + eppnt->p_filesz;
    padzero(elf_bss);
 
-   len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
-   bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
+   len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + ELF_MIN_ALIGN - 1);
+   bss = eppnt->p_memsz + eppnt->p_vaddr;
    if (bss > len) {
       down_write(¤t->mm->mmap_sem);
       do_brk(len, bss - len);