[yocto] [EDT][PATCH][prelink-cross] dso validation check fix

Maninder Singh maninder1.s at samsung.com
Tue May 5 22:16:03 PDT 2015


EP-F6AA0618C49C4AEDA73BFF1B39950BAB
Hi Mark,

dso null pointer check is wrongly placed.


Signed-off-by: Maninder Singh <maninder1.s at samsung.com>
Signed-off-by: Vaneet Narang <v.narang at samsung.com>
Reviewed-by: Ajeet Yadav <ajeet.y at samsung.com>
---
 trunk/src/rtld/rtld.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trunk/src/rtld/rtld.c b/trunk/src/rtld/rtld.c
index 35dfde7..f88ce7f 100644
--- a/trunk/src/rtld/rtld.c
+++ b/trunk/src/rtld/rtld.c
@@ -479,13 +479,13 @@ find_lib_in_path (struct search_path *path, const char *soname,
       if (wrap_access (ret, F_OK) == 0)
    {
      DSO *dso = open_dso (ret);
+     if (dso == NULL)
+       continue;
           int dso_class = gelf_getclass (dso->elf);
      int dso_machine = (dso_class == ELFCLASS32) ?
                elf32_getehdr (dso->elf)->e_machine :
                elf64_getehdr (dso->elf)->e_machine;

-     if (dso == NULL)
-       continue;

      /* Skip 32-bit libraries when looking for 64-bit.  Also
         skip libraries for alternative machines.  */
--
1.7.1


Thanks and Regards,
Maninder Singh


More information about the yocto mailing list