[Qemu-devel] [PATCH] Fix symfind.

[Laurent Desnogues <laurent.desnogues@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

Hello,

this patch fixes an issue in symfind.

Assume you have the following symbols:

Address  Size
0045bca0 00000080 T s0
0045bd20 00000112 T s1

You'll notice that s1 is s0 + size.

So the current symfind will find that address 0045bd20 belongs to s0
instead of s1.


Laurent

Signed-off-by: Laurent Desnogues <laurent.desnogues@gmail.com>

[-- Attachment #2: symfind.patch --]
[-- Type: application/octet-stream, Size: 914 bytes --]

diff --git a/elf_ops.h b/elf_ops.h
index 72cd83e..1ecb58c 100644
--- a/elf_ops.h
+++ b/elf_ops.h
@@ -67,7 +67,7 @@ static int glue(symfind, SZ)(const void *s0, const void *s1)
     int result = 0;
     if (key->st_value < sym->st_value) {
         result = -1;
-    } else if (key->st_value > sym->st_value + sym->st_size) {
+    } else if (key->st_value >= sym->st_value + sym->st_size) {
         result = 1;
     }
     return result;
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 63d0ae4..a3ed7e6 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1199,7 +1199,7 @@ static int symfind(const void *s0, const void *s1)
     int result = 0;
     if (key->st_value < sym->st_value) {
         result = -1;
-    } else if (key->st_value > sym->st_value + sym->st_size) {
+    } else if (key->st_value >= sym->st_value + sym->st_size) {
         result = 1;
     }
     return result;