1 files changed, 7 insertions, 6 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 672a3b90bc55..dfd8cfb7fb5d 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -515,7 +515,8 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
 {
         unsigned int random_variable = 0;
 
-        if (current->flags & PF_RANDOMIZE) {
+        if ((current->flags & PF_RANDOMIZE) &&
+                !(current->personality & ADDR_NO_RANDOMIZE)) {
                 random_variable = get_random_int() & STACK_RND_MASK;
                 random_variable <<= PAGE_SHIFT;
         }
@@ -1262,7 +1263,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs)
         return;
 }
 
-static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset)
+static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
 {
         phdr->p_type = PT_NOTE;
         phdr->p_offset = offset;
@@ -1428,7 +1429,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
         int i;
         struct vm_area_struct *vma;
         struct elfhdr *elf = NULL;
-        off_t offset = 0, dataoff;
+        loff_t offset = 0, dataoff;
         unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
         int numnote;
         struct memelfnote *notes = NULL;
@@ -1661,11 +1662,11 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
         ELF_CORE_WRITE_EXTRA_DATA;
 #endif
 
-        if ((off_t)file->f_pos != offset) {
+        if (file->f_pos != offset) {
                 /* Sanity check */
                 printk(KERN_WARNING
-                       "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n",
-                       (off_t)file->f_pos, offset);
+                       "elf_core_dump: file->f_pos (%Ld) != offset (%Ld)\n",
+                       file->f_pos, offset);
         }
 
 end_coredump: