git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
binfmt_elf.c
diff --git
a/fs/binfmt_elf.c
b/fs/binfmt_elf.c
index
55235a6
..
abb113e
100644
(file)
--- a/
fs/binfmt_elf.c
+++ b/
fs/binfmt_elf.c
@@
-1055,6
+1055,7
@@
out_free_ph:
static int load_elf_library(struct file *file)
{
struct elf_phdr *elf_phdata;
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;
unsigned long elf_bss, bss, len;
int retval, error, i, j;
struct elfhdr elf_ex;
@@
-1078,41
+1079,44
@@
static int load_elf_library(struct file *file)
/* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */
error = -ENOMEM;
/* 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;
if (!elf_phdata)
goto out;
+ eppnt = elf_phdata;
error = -ENOEXEC;
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 (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;
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,
/* Now use mmap to map the library into memory. */
down_write(¤t->mm->mmap_sem);
error = do_mmap(file,
- ELF_PAGESTART(e
lf_phdata
->p_vaddr),
- (e
lf_phdata
->p_filesz +
-
ELF_PAGEOFFSET(elf_phdata
->p_vaddr)),
+ ELF_PAGESTART(e
ppnt
->p_vaddr),
+ (e
ppnt
->p_filesz +
+
ELF_PAGEOFFSET(eppnt
->p_vaddr)),
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
- (e
lf_phdata
->p_offset -
- ELF_PAGEOFFSET(e
lf_phdata
->p_vaddr)));
+ (e
ppnt
->p_offset -
+ ELF_PAGEOFFSET(e
ppnt
->p_vaddr)));
up_write(¤t->mm->mmap_sem);
up_write(¤t->mm->mmap_sem);
- if (error != ELF_PAGESTART(e
lf_phdata
->p_vaddr))
+ if (error != ELF_PAGESTART(e
ppnt
->p_vaddr))
goto out_free_ph;
goto out_free_ph;
- elf_bss = e
lf_phdata->p_vaddr + elf_phdata
->p_filesz;
+ elf_bss = e
ppnt->p_vaddr + eppnt
->p_filesz;
padzero(elf_bss);
padzero(elf_bss);
- len = ELF_PAGESTART(e
lf_phdata->p_filesz + elf_phdata
->p_vaddr + ELF_MIN_ALIGN - 1);
- bss = e
lf_phdata->p_memsz + elf_phdata
->p_vaddr;
+ len = ELF_PAGESTART(e
ppnt->p_filesz + eppnt
->p_vaddr + ELF_MIN_ALIGN - 1);
+ bss = e
ppnt->p_memsz + eppnt
->p_vaddr;
if (bss > len)
do_brk(len, bss - len);
error = 0;
if (bss > len)
do_brk(len, bss - len);
error = 0;