From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun, 20 Oct 2024 11:58:21 +0000 (+0200)
Subject: libkmod: Remove elf_find_section
X-Git-Tag: v34~191
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3aa4ed08d13b78bf3ed6aa8a58f72a11132c4e;p=thirdparty%2Fkmod.git

libkmod: Remove elf_find_section

The function's purpose can be merged into elf_get_section. Reduces
amount of duplicated code.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/196
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index 2fb215d7..e0a7f85e 100644
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -353,26 +353,10 @@ const void *kmod_elf_get_memory(const struct kmod_elf *elf)
 	return elf->memory;
 }
 
-static int elf_find_section(const struct kmod_elf *elf, const char *section)
-{
-	uint16_t i;
-
-	for (i = 1; i < elf->header.section.count; i++) {
-		uint64_t off, size;
-		const char *n;
-		int err = elf_get_section_info(elf, i, &off, &size, &n);
-		if (err < 0)
-			continue;
-		if (!streq(section, n))
-			continue;
-
-		return i;
-	}
-
-	return -ENODATA;
-}
-
-/* on success, sec_off and sec_size are range checked and valid */
+/*
+ * Returns section index on success, negative value otherwise.
+ * On success, sec_off and sec_size are range checked and valid.
+ */
 int kmod_elf_get_section(const struct kmod_elf *elf, const char *section,
 			 uint64_t *sec_off, uint64_t *sec_size)
 {
@@ -392,7 +376,7 @@ int kmod_elf_get_section(const struct kmod_elf *elf, const char *section,
 
 		*sec_off = off;
 		*sec_size = size;
-		return 0;
+		return i;
 	}
 
 	return -ENODATA;
@@ -551,7 +535,8 @@ static int elf_strip_versions_section(const struct kmod_elf *elf, uint8_t *chang
 {
 	uint64_t off, size;
 	const void *buf;
-	int idx = elf_find_section(elf, "__versions");
+	/* the off and size values are not used, supply them as dummies */
+	int idx = kmod_elf_get_section(elf, "__versions", &off, &size);
 	uint64_t val;
 
 	if (idx < 0)