From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MPwpZ-0007Ef-Gi
	for qemu-devel@nongnu.org; Sun, 12 Jul 2009 07:02:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MPwpU-00079u-B8
	for qemu-devel@nongnu.org; Sun, 12 Jul 2009 07:02:52 -0400
Received: from [199.232.76.173] (port=36908 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MPwpU-00079V-3L
	for qemu-devel@nongnu.org; Sun, 12 Jul 2009 07:02:48 -0400
Received: from mail-fx0-f211.google.com ([209.85.220.211]:59897)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <jcmvbkbc@gmail.com>) id 1MPwpT-0005nK-GJ
	for qemu-devel@nongnu.org; Sun, 12 Jul 2009 07:02:47 -0400
Received: by fxm7 with SMTP id 7so1435284fxm.34
	for <qemu-devel@nongnu.org>; Sun, 12 Jul 2009 04:02:45 -0700 (PDT)
From: Max Filippov <jcmvbkbc@gmail.com>
Subject: [Qemu-devel] [PATCH] linux-user: elfload: allocate and initialize
	memsz-filesz gap
Date: Sun, 12 Jul 2009 15:02:38 +0400
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200907121502.39025.jcmvbkbc@gmail.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Hello.

I'm having ppc ELF binaries that I'm running on x86 in linux-user emulation.
Some of these binaries work fine, but others segfault.
The latter binaries have segments with p_filesz < p_memsz and sections like .bss in this gap.
Segfaults usually happen in attempt to access address within this gap. 
According to the linux-user/elfload.c only first p_filesz bytes of such segments are mmaped and mprotected.

This patch mmaps p_memsz bytes and then zero out last p_memsz - p_filesz bytes of such segments.
Is there a better way to do it?

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
diff -burN qemu-snapshot-2009-07-11_r7249-orig/linux-user/elfload.c qemu-snapshot-2009-07-11_r7249/linux-user/elfload.c
--- qemu-snapshot-2009-07-11_r7249-orig/linux-user/elfload.c	2009-07-11 06:12:23.000000000 +0400
+++ qemu-snapshot-2009-07-11_r7249/linux-user/elfload.c	2009-07-12 04:47:47.000000000 +0400
@@ -1380,7 +1380,7 @@
         }
 
         error = target_mmap(TARGET_ELF_PAGESTART(load_bias + elf_ppnt->p_vaddr),
-                            (elf_ppnt->p_filesz +
+                            (elf_ppnt->p_memsz +
                              TARGET_ELF_PAGEOFFSET(elf_ppnt->p_vaddr)),
                             elf_prot,
                             (MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE),
@@ -1392,6 +1392,20 @@
             exit(-1);
         }
 
+        if(elf_ppnt->p_memsz > elf_ppnt->p_filesz) {
+            abi_ulong pg = TARGET_ELF_PAGESTART(load_bias + elf_ppnt->p_vaddr) +
+                (elf_ppnt->p_filesz +
+                 TARGET_ELF_PAGEOFFSET(elf_ppnt->p_vaddr));
+            abi_ulong sz = elf_ppnt->p_memsz - elf_ppnt->p_filesz;
+
+            void *p = lock_user(PAGE_READ | PAGE_WRITE, pg, sz, 0);
+
+            if (p) {
+                memset(p, 0, sz);
+                unlock_user(p, pg, sz);
+            }
+        }
+
 #ifdef LOW_ELF_STACK
         if (TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr) < elf_stack)
             elf_stack = TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr);


Thanks.
-- Max