From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 27 Nov 2023 10:28:07 +0000 (+0100)
Subject: elf: In _dl_relocate_object, skip processing if object is relocated
X-Git-Tag: upstream/2.39~243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b893410be304ddcea0bd43f537a13e8b18d37cf2;p=platform%2Fupstream%2Fglibc.git

elf: In _dl_relocate_object, skip processing if object is relocated

This is just a minor optimization.  It also makes it more obvious that
_dl_relocate_object can be called multiple times.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index e5c555d..72c8586 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -205,6 +205,9 @@ void
 _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 		     int reloc_mode, int consider_profiling)
 {
+  if (l->l_relocated)
+    return;
+
   struct textrels
   {
     caddr_t start;
@@ -242,9 +245,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 # define consider_symbind 0
 #endif
 
-  if (l->l_relocated)
-    return;
-
   /* If DT_BIND_NOW is set relocate all references in this object.  We
      do not do this if we are profiling, of course.  */
   // XXX Correct for auditing?