Skip to content

fix(#6671): fix possible stack buffer overflow in gen-s-parser.inc #6678

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
tlively merged 1 commit into from
Jun 18, 2024
Merged

fix(#6671): fix possible stack buffer overflow in gen-s-parser.inc #6678

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions scripts/gen-s-parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,10 @@ def instruction_parser():

printer.print_line("auto op = *keyword;")
printer.print_line("char buf[{}] = {{}};".format(inst_length + 1))
printer.print_line("// Ensure we do not copy more than the buffer can hold")
printer.print_line("if (op.size() >= sizeof(buf)) {")
printer.print_line(" goto parse_error;")
printer.print_line("}")
printer.print_line("memcpy(buf, op.data(), op.size());")

def print_leaf(expr, inst):
Expand Down Expand Up @@ -754,9 +758,11 @@ def emit(node, idx=0):
def print_header():
print("// DO NOT EDIT! This file generated by scripts/gen-s-parser.py\n")
print("// clang-format off\n")
print("// NOLINTBEGIN\n")


def print_footer():
print("\n// NOLINTEND")
print("\n// clang-format on")


Expand Down
8 changes: 8 additions & 0 deletions src/gen-s-parser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

// clang-format off

// NOLINTBEGIN

auto op = *keyword;
char buf[33] = {};
// Ensure we do not copy more than the buffer can hold
if (op.size() >= sizeof(buf)) {
goto parse_error;
}
memcpy(buf, op.data(), op.size());
switch (buf[0]) {
case 'a': {
Expand Down Expand Up @@ -5151,4 +5157,6 @@ switch (buf[0]) {
parse_error:
return ctx.in.err(pos, "unrecognized instruction");

// NOLINTEND

// clang-format on