objtool: Fix up st_info in COMDAT group section

When __elf_create_symbol creates a local symbol, it relocates the first
global symbol upwards to make space. Subsequently, elf_update_symbol()
is called to refresh the symbol table section. However, this isn't
sufficient, as other sections might have the reference to the old
symbol index, for instance, the sh_info field of an SHT_GROUP section.

This patch updates the `sh_info` field when necessary. This field
serves as the key for the COMDAT group. An incorrect key would prevent
the linker's from deduplicating COMDAT symbols, leading to duplicate
definitions in the final link.

Signed-off-by: Rong Xu <xur@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250425200541.113015-1-xur@google.com

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 727a3a4fd9d774d1bbfe22c075c2e51cf10150fe..8dffe68d705c6ae126bb32583ad43f59ca9b1468 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -572,6 +572,30 @@ err:
        return -1;
 }
 
+/*
+ * @sym's idx has changed.  Update the sh_info in group sections.
+ */
+static void elf_update_group_sh_info(struct elf *elf, Elf32_Word symtab_idx,
+                                    Elf32_Word new_idx, Elf32_Word old_idx)
+{
+       struct section *sec;
+
+       list_for_each_entry(sec, &elf->sections, list) {
+               if (sec->sh.sh_type != SHT_GROUP)
+                       continue;
+               if (sec->sh.sh_link == symtab_idx &&
+                   sec->sh.sh_info == old_idx) {
+                       sec->sh.sh_info = new_idx;
+                       mark_sec_changed(elf, sec, true);
+                       /*
+                        * Each ELF group should have a unique symbol key.
+                        * Return early on match.
+                        */
+                       return;
+               }
+       }
+}
+
 /*
  * @sym's idx has changed.  Update the relocs which reference it.
  */
@@ -745,7 +769,7 @@ __elf_create_symbol(struct elf *elf, struct symbol *sym)
 
        /*
         * Move the first global symbol, as per sh_info, into a new, higher
-        * symbol index. This fees up a spot for a new local symbol.
+        * symbol index. This frees up a spot for a new local symbol.
         */
        first_non_local = symtab->sh.sh_info;
        old = find_symbol_by_index(elf, first_non_local);
@@ -763,6 +787,7 @@ __elf_create_symbol(struct elf *elf, struct symbol *sym)
                if (elf_update_sym_relocs(elf, old))
                        return NULL;
 
+               elf_update_group_sh_info(elf, symtab->idx, new_idx, first_non_local);
                new_idx = first_non_local;
        }