Skip to content
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.

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

[DWARFLibrary] Add bounds check to Contrib index #76405

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

DavidKorczynski
Copy link
Contributor

Index should be within the range of Contrib before being used as an index.

Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30308

Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot
Copy link
Collaborator

llvmbot commented Dec 26, 2023

@llvm/pr-subscribers-debuginfo

Author: None (DavidKorczynski)

Changes

Index should be within the range of Contrib before being used as an index.

Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30308


Full diff: https://github.com/llvm/llvm-project/pull/76405.diff

1 Files Affected:

  • (modified) llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp (+3)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
index a4487e2dc21be1..208e3ac2c55343 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
@@ -157,6 +157,9 @@ bool DWARFUnitIndex::parseImpl(DataExtractor IndexData) {
     auto Index = IndexData.getU32(&Offset);
     if (!Index)
       continue;
+    // Ensure Index is in valid range
+    if (Index > Header.NumColumns)
+      return false;
     Rows[i].Index = this;
     Rows[i].Contributions =
         std::make_unique<Entry::SectionContribution[]>(Header.NumColumns);

Index should be within the range of Contrib before being used as an
index.

Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30308

Signed-off-by: David Korczynski <david@adalogics.com>
@dwblaikie
Copy link
Collaborator

Test coverage?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants