Skip to content

r2plugin: prevent command injection in signature fallback apply path #31

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

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

r2plugin: prevent command injection in signature fallback apply path #31

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
28 changes: 28 additions & 0 deletions r2plugin/r_anal_sleigh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4587,6 +4587,28 @@ static bool verify_callconv_apply(RAnal *anal, ut64 fcn_addr, const char *cc_nam
return strings_match_normalized (target_fcn->callconv, cc_name);
}

static bool signature_contains_cmd_separator(const char *signature) {
const unsigned char *p;

if (!signature || !*signature) {
return false;
}
for (p = (const unsigned char *)signature; *p; p++) {
switch (*p) {
case ';':
case '|':
case '&':
case '\n':
case '\r':
case '!':
return true;
default:
break;
}
}
return false;
}

static WritebackApplyResult apply_inferred_signature(
RAnal *anal,
RCore *core,
Expand All @@ -4613,6 +4635,12 @@ static WritebackApplyResult apply_inferred_signature(
return res;
}
res.cmd_fallback_attempted = true;
if (signature_contains_cmd_separator (signature)) {
write_reason_msg (res.detail, sizeof (res.detail),
"signature contains command separator");
res.cmd_apply_fail = true;
return res;
}
r_core_cmdf_at (core, fcn->addr, "afs %s", signature);
if (verify_signature_type_db_ex (anal, fcn, sig_root, res.detail, sizeof (res.detail))) {
res.path = WRITEBACK_APPLY_CMD;
Expand Down
Loading