authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-12-05 13:28:47+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-12-05 13:28:47+01:00
logaf8621db2d2de4675240dad0ff885f23dc33f518
tree6d3085ccc8bd161aacfd2d5d1b3c9f9a771ea33d
parent72568c131dcfc9303de0a809e02290c7ac464663

elf: report error at the point where it is happening

2 files changed, 29 insertions(+), 0 deletions(-)

src/link/Elf.zig+14
...@@ -1760,6 +1760,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {...@@ -1760,6 +1760,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
1760}1760}
17611761
1762const ParseError = error{1762const ParseError = error{
1763 LinkFail,
1763 UnknownFileType,1764 UnknownFileType,
1764 InvalidCpuArch,1765 InvalidCpuArch,
1765 OutOfMemory,1766 OutOfMemory,
...@@ -1769,6 +1770,7 @@ const ParseError = error{...@@ -1769,6 +1770,7 @@ const ParseError = error{
1769 FileSystem,1770 FileSystem,
1770 NotSupported,1771 NotSupported,
1771 InvalidCharacter,1772 InvalidCharacter,
1773 MalformedObject,
1772} || LdScript.Error || std.os.AccessError || std.os.SeekError || std.fs.File.OpenError || std.fs.File.ReadError;1774} || LdScript.Error || std.os.AccessError || std.os.SeekError || std.fs.File.OpenError || std.fs.File.ReadError;
17731775
1774fn parsePositional(self: *Elf, path: []const u8, must_link: bool, ctx: *ParseErrorCtx) ParseError!void {1776fn parsePositional(self: *Elf, path: []const u8, must_link: bool, ctx: *ParseErrorCtx) ParseError!void {
...@@ -6057,6 +6059,7 @@ fn handleAndReportParseError(...@@ -6057,6 +6059,7 @@ fn handleAndReportParseError(
6057) error{OutOfMemory}!void {6059) error{OutOfMemory}!void {
6058 const cpu_arch = self.base.options.target.cpu.arch;6060 const cpu_arch = self.base.options.target.cpu.arch;
6059 switch (err) {6061 switch (err) {
6062 error.LinkFail => {}, // already reported
6060 error.UnknownFileType => try self.reportParseError(path, "unknown file type", .{}),6063 error.UnknownFileType => try self.reportParseError(path, "unknown file type", .{}),
6061 error.InvalidCpuArch => try self.reportParseError(6064 error.InvalidCpuArch => try self.reportParseError(
6062 path,6065 path,
...@@ -6082,6 +6085,17 @@ fn reportParseError(...@@ -6082,6 +6085,17 @@ fn reportParseError(
6082 try err.addNote(self, "while parsing {s}", .{path});6085 try err.addNote(self, "while parsing {s}", .{path});
6083}6086}
60846087
6088pub fn reportParseError2(
6089 self: *Elf,
6090 file_index: File.Index,
6091 comptime format: []const u8,
6092 args: anytype,
6093) error{OutOfMemory}!void {
6094 var err = try self.addErrorWithNotes(1);
6095 try err.addMsg(self, format, args);
6096 try err.addNote(self, "while parsing {}", .{self.file(file_index).?.fmtPath()});
6097}
6098
6085const FormatShdrCtx = struct {6099const FormatShdrCtx = struct {
6086 elf_file: *Elf,6100 elf_file: *Elf,
6087 shdr: elf.Elf64_Shdr,6101 shdr: elf.Elf64_Shdr,
src/link/Elf/Object.zig+15
...@@ -58,6 +58,17 @@ pub fn parse(self: *Object, elf_file: *Elf) !void {...@@ -58,6 +58,17 @@ pub fn parse(self: *Object, elf_file: *Elf) !void {
5858
59 const gpa = elf_file.base.allocator;59 const gpa = elf_file.base.allocator;
6060
61 if (self.data.len < self.header.?.e_shoff or
62 self.data.len < self.header.?.e_shoff + self.header.?.e_shnum * @sizeOf(elf.Elf64_Shdr))
63 {
64 try elf_file.reportParseError2(
65 self.index,
66 "corrupted header: section header table extends past the end of file",
67 .{},
68 );
69 return error.LinkFail;
70 }
71
61 const shoff = math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;72 const shoff = math.cast(usize, self.header.?.e_shoff) orelse return error.Overflow;
62 const shdrs = @as(73 const shdrs = @as(
63 [*]align(1) const elf.Elf64_Shdr,74 [*]align(1) const elf.Elf64_Shdr,
...@@ -66,6 +77,10 @@ pub fn parse(self: *Object, elf_file: *Elf) !void {...@@ -66,6 +77,10 @@ pub fn parse(self: *Object, elf_file: *Elf) !void {
66 try self.shdrs.ensureTotalCapacityPrecise(gpa, shdrs.len);77 try self.shdrs.ensureTotalCapacityPrecise(gpa, shdrs.len);
6778
68 for (shdrs) |shdr| {79 for (shdrs) |shdr| {
80 if (self.data.len < shdr.sh_offset or self.data.len < shdr.sh_offset + shdr.sh_size) {
81 try elf_file.reportParseError2(self.index, "corrupted section header", .{});
82 return error.LinkFail;
83 }
69 self.shdrs.appendAssumeCapacity(try ElfShdr.fromElf64Shdr(shdr));84 self.shdrs.appendAssumeCapacity(try ElfShdr.fromElf64Shdr(shdr));
70 }85 }
7186