diff options
Diffstat (limited to 'arch/x86_64/ia32')
-rw-r--r-- | arch/x86_64/ia32/ia32_aout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c index 396d3c100011..be87df506f39 100644 --- a/arch/x86_64/ia32/ia32_aout.c +++ b/arch/x86_64/ia32/ia32_aout.c | |||
@@ -272,7 +272,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
272 | if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC && | 272 | if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC && |
273 | N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) || | 273 | N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) || |
274 | N_TRSIZE(ex) || N_DRSIZE(ex) || | 274 | N_TRSIZE(ex) || N_DRSIZE(ex) || |
275 | i_size_read(bprm->file->f_dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) { | 275 | i_size_read(bprm->file->f_path.dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) { |
276 | return -ENOEXEC; | 276 | return -ENOEXEC; |
277 | } | 277 | } |
278 | 278 | ||
@@ -357,7 +357,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
357 | { | 357 | { |
358 | printk(KERN_WARNING | 358 | printk(KERN_WARNING |
359 | "fd_offset is not page aligned. Please convert program: %s\n", | 359 | "fd_offset is not page aligned. Please convert program: %s\n", |
360 | bprm->file->f_dentry->d_name.name); | 360 | bprm->file->f_path.dentry->d_name.name); |
361 | error_time = jiffies; | 361 | error_time = jiffies; |
362 | } | 362 | } |
363 | #endif | 363 | #endif |
@@ -440,7 +440,7 @@ static int load_aout_library(struct file *file) | |||
440 | int retval; | 440 | int retval; |
441 | struct exec ex; | 441 | struct exec ex; |
442 | 442 | ||
443 | inode = file->f_dentry->d_inode; | 443 | inode = file->f_path.dentry->d_inode; |
444 | 444 | ||
445 | retval = -ENOEXEC; | 445 | retval = -ENOEXEC; |
446 | error = kernel_read(file, 0, (char *) &ex, sizeof(ex)); | 446 | error = kernel_read(file, 0, (char *) &ex, sizeof(ex)); |
@@ -471,7 +471,7 @@ static int load_aout_library(struct file *file) | |||
471 | { | 471 | { |
472 | printk(KERN_WARNING | 472 | printk(KERN_WARNING |
473 | "N_TXTOFF is not page aligned. Please convert library: %s\n", | 473 | "N_TXTOFF is not page aligned. Please convert library: %s\n", |
474 | file->f_dentry->d_name.name); | 474 | file->f_path.dentry->d_name.name); |
475 | error_time = jiffies; | 475 | error_time = jiffies; |
476 | } | 476 | } |
477 | #endif | 477 | #endif |