From 2e1dd1e554c9f557165520eba6199325b85c2d03 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 5 Dec 2023 13:53:11 +0100 Subject: [PATCH] elf: move basic parse error reporting to SharedObject --- src/link/Elf/SharedObject.zig | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/link/Elf/SharedObject.zig b/src/link/Elf/SharedObject.zig index b3302b88d4..21359230c2 100644 --- a/src/link/Elf/SharedObject.zig +++ b/src/link/Elf/SharedObject.zig @@ -52,6 +52,27 @@ pub fn parse(self: *SharedObject, elf_file: *Elf) !void { const reader = stream.reader(); self.header = try reader.readStruct(elf.Elf64_Ehdr); + + if (elf_file.base.options.target.cpu.arch != self.header.?.e_machine.toTargetCpuArch().?) { + try elf_file.reportParseError2( + self.index, + "invalid cpu architecture: {s}", + .{@tagName(self.header.?.e_machine.toTargetCpuArch().?)}, + ); + return error.InvalidCpuArch; + } + + if (self.data.len < self.header.?.e_shoff or + self.data.len < self.header.?.e_shoff + self.header.?.e_shnum * @sizeOf(elf.Elf64_Shdr)) + { + try elf_file.reportParseError2( + self.index, + "corrupted header: section header table extends past the end of file", + .{}, + ); + return error.LinkFail; + } + const shoff = std.math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow; const shdrs = @as( @@ -61,6 +82,10 @@ pub fn parse(self: *SharedObject, elf_file: *Elf) !void { try self.shdrs.ensureTotalCapacityPrecise(gpa, shdrs.len); for (shdrs, 0..) |shdr, i| { + if (self.data.len < shdr.sh_offset or self.data.len < shdr.sh_offset + shdr.sh_size) { + try elf_file.reportParseError2(self.index, "corrupted section header", .{}); + return error.LinkFail; + } self.shdrs.appendAssumeCapacity(try ElfShdr.fromElf64Shdr(shdr)); switch (shdr.sh_type) { elf.SHT_DYNSYM => self.dynsym_sect_index = @as(u16, @intCast(i)),