Skip to content

Reject overflowing ELF section ranges #19393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elad335 merged 1 commit into from
Sep 3, 2026
+6 −2
Merged

Reject overflowing ELF section ranges #19393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions rpcs3/Loader/ELF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ class elf_object
// Try to find it in phdr data instead of allocating new section
p_index++;

if (hdr.p_offset <= shdr.sh_offset && shdr.sh_offset + shdr.sh_size <= hdr.p_offset + hdr.p_filesz)
if (hdr.p_offset <= shdr.sh_offset &&
shdr.sh_size <= hdr.p_filesz &&
shdr.sh_offset - hdr.p_offset <= hdr.p_filesz - shdr.sh_size)
{
const auto& prog = ::at32(progs, p_index);
shdrs.back().bin_view = {prog.bin.data() + shdr.sh_offset - hdr.p_offset, shdr.sh_size};
Expand Down Expand Up @@ -469,7 +471,9 @@ class elf_object
p_index++;

// Rely on previous sh_offset value!
if (hdr.p_offset <= shdr.sh_offset && shdr.sh_offset + shdr.sh_size - 1 <= hdr.p_offset + hdr.p_filesz - 1)
if (hdr.p_offset <= shdr.sh_offset &&
shdr.sh_size <= hdr.p_filesz &&
shdr.sh_offset - hdr.p_offset <= hdr.p_filesz - shdr.sh_size)
{
out.sh_offset = ::narrow<sz_t>(data_base + static_cast<usz>(shdr.sh_offset - hdr.p_offset));
result = true;
Expand Down
Loading