diff options
Diffstat (limited to 'fs/binfmt_aout.c')
-rw-r--r-- | fs/binfmt_aout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index 517e111bb7ef..813a887cd2b3 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c | |||
@@ -274,7 +274,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
274 | if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC && | 274 | if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC && |
275 | N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) || | 275 | N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) || |
276 | N_TRSIZE(ex) || N_DRSIZE(ex) || | 276 | N_TRSIZE(ex) || N_DRSIZE(ex) || |
277 | i_size_read(bprm->file->f_dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) { | 277 | i_size_read(bprm->file->f_path.dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) { |
278 | return -ENOEXEC; | 278 | return -ENOEXEC; |
279 | } | 279 | } |
280 | 280 | ||
@@ -389,7 +389,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
389 | { | 389 | { |
390 | printk(KERN_WARNING | 390 | printk(KERN_WARNING |
391 | "fd_offset is not page aligned. Please convert program: %s\n", | 391 | "fd_offset is not page aligned. Please convert program: %s\n", |
392 | bprm->file->f_dentry->d_name.name); | 392 | bprm->file->f_path.dentry->d_name.name); |
393 | error_time = jiffies; | 393 | error_time = jiffies; |
394 | } | 394 | } |
395 | 395 | ||
@@ -469,7 +469,7 @@ static int load_aout_library(struct file *file) | |||
469 | int retval; | 469 | int retval; |
470 | struct exec ex; | 470 | struct exec ex; |
471 | 471 | ||
472 | inode = file->f_dentry->d_inode; | 472 | inode = file->f_path.dentry->d_inode; |
473 | 473 | ||
474 | retval = -ENOEXEC; | 474 | retval = -ENOEXEC; |
475 | error = kernel_read(file, 0, (char *) &ex, sizeof(ex)); | 475 | error = kernel_read(file, 0, (char *) &ex, sizeof(ex)); |
@@ -506,7 +506,7 @@ static int load_aout_library(struct file *file) | |||
506 | { | 506 | { |
507 | printk(KERN_WARNING | 507 | printk(KERN_WARNING |
508 | "N_TXTOFF is not page aligned. Please convert library: %s\n", | 508 | "N_TXTOFF is not page aligned. Please convert library: %s\n", |
509 | file->f_dentry->d_name.name); | 509 | file->f_path.dentry->d_name.name); |
510 | error_time = jiffies; | 510 | error_time = jiffies; |
511 | } | 511 | } |
512 | down_write(¤t->mm->mmap_sem); | 512 | down_write(¤t->mm->mmap_sem); |