Commit b61b7ee4 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] more annotations in binfmt_aout.c

parent 8da81535
...@@ -348,7 +348,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) ...@@ -348,7 +348,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
return error; return error;
} }
error = bprm->file->f_op->read(bprm->file, (char *)text_addr, error = bprm->file->f_op->read(bprm->file,
(char __user *)text_addr,
ex.a_text+ex.a_data, &pos); ex.a_text+ex.a_data, &pos);
if ((signed long)error < 0) { if ((signed long)error < 0) {
send_sig(SIGKILL, current, 0); send_sig(SIGKILL, current, 0);
...@@ -377,7 +378,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) ...@@ -377,7 +378,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
loff_t pos = fd_offset; loff_t pos = fd_offset;
do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), bprm->file->f_op->read(bprm->file,
(char __user *)N_TXTADDR(ex),
ex.a_text+ex.a_data, &pos); ex.a_text+ex.a_data, &pos);
flush_icache_range((unsigned long) N_TXTADDR(ex), flush_icache_range((unsigned long) N_TXTADDR(ex),
(unsigned long) N_TXTADDR(ex) + (unsigned long) N_TXTADDR(ex) +
...@@ -479,7 +481,7 @@ static int load_aout_library(struct file *file) ...@@ -479,7 +481,7 @@ static int load_aout_library(struct file *file)
do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
file->f_op->read(file, (char *)start_addr, file->f_op->read(file, (char __user *)start_addr,
ex.a_text + ex.a_data, &pos); ex.a_text + ex.a_data, &pos);
flush_icache_range((unsigned long) start_addr, flush_icache_range((unsigned long) start_addr,
(unsigned long) start_addr + ex.a_text + ex.a_data); (unsigned long) start_addr + ex.a_text + ex.a_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment