With freader we don't need to restrict ourselves to a single page, so
let's allow ELF notes to be at any valid position with the file.
We also merge parse_build_id() and parse_build_id_buf() as now the only
difference between them is note offset overflow, which makes sense to
check in all situations.
Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
---
lib/buildid.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/lib/buildid.c b/lib/buildid.c
index 6b5558cd95bf..78cfb3048385 100644
--- a/lib/buildid.c
+++ b/lib/buildid.c
@@ -155,9 +155,8 @@ static void freader_cleanup(struct freader *r)
* 32-bit and 64-bit system, because Elf32_Nhdr and Elf64_Nhdr are
* identical.
*/
-static int parse_build_id_buf(struct freader *r,
- unsigned char *build_id, __u32 *size,
- u64 note_offs, Elf32_Word note_size)
+static int parse_build_id(struct freader *r, unsigned char *build_id, __u32 *size,
+ u64 note_offs, Elf32_Word note_size)
{
const char note_name[] = "GNU";
const size_t note_name_sz = sizeof(note_name);
@@ -166,6 +165,10 @@ static int parse_build_id_buf(struct freader *r,
u32 name_sz, desc_sz;
const char *data;
+ /* check for overflow */
+ if (note_offs + note_size < note_offs)
+ return -EINVAL;
+
while (note_offs + sizeof(Elf32_Nhdr) < note_end) {
nhdr = freader_fetch(r, note_offs, sizeof(Elf32_Nhdr) + note_name_sz);
if (!nhdr)
@@ -199,23 +202,6 @@ static int parse_build_id_buf(struct freader *r,
return -EINVAL;
}
-static inline int parse_build_id(struct freader *r,
- unsigned char *build_id,
- __u32 *size,
- u64 note_start_off,
- Elf32_Word note_size)
-{
- /* check for overflow */
- if (note_start_off + note_size < note_start_off)
- return -EINVAL;
-
- /* only supports note that fits in the first page */
- if (note_start_off + note_size > PAGE_SIZE)
- return -EINVAL;
-
- return parse_build_id_buf(r, build_id, size, note_start_off, note_size);
-}
-
/* Parse build ID from 32-bit ELF */
static int get_build_id_32(struct freader *r, unsigned char *build_id, __u32 *size)
{
--
2.43.0
