Skip to content

Commit 2a740f6

Browse files
committed
Rename pid to tid in prepare_ptrace
1 parent 6a9528f commit 2a740f6

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

‎src/record_syscall.cc‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2798,12 +2798,12 @@ static int non_negative_command(int command) { return command < 0 ? INT32_MAX :
27982798
template <typename Arch>
27992799
static Switchable prepare_ptrace(RecordTask* t,
28002800
TaskSyscallState& syscall_state) {
2801-
pid_t pid = (pid_t)t->regs().arg2_signed();
2801+
pid_t tid = (pid_t)t->regs().arg2_signed();
28022802
bool emulate = true;
28032803
int command = (int)t->regs().arg1_signed();
28042804
switch (non_negative_command(command)) {
28052805
case PTRACE_ATTACH: {
2806-
RecordTask* tracee = prepare_ptrace_attach(t, pid, syscall_state);
2806+
RecordTask* tracee = prepare_ptrace_attach(t, tid, syscall_state);
28072807
if (!tracee) {
28082808
break;
28092809
}
@@ -2833,7 +2833,7 @@ static Switchable prepare_ptrace(RecordTask* t,
28332833
break;
28342834
}
28352835
case PTRACE_SEIZE: {
2836-
RecordTask* tracee = prepare_ptrace_attach(t, pid, syscall_state);
2836+
RecordTask* tracee = prepare_ptrace_attach(t, tid, syscall_state);
28372837
if (!tracee) {
28382838
break;
28392839
}
@@ -2856,7 +2856,7 @@ static Switchable prepare_ptrace(RecordTask* t,
28562856
case Arch::PTRACE_OLDSETOPTIONS:
28572857
RR_FALLTHROUGH;
28582858
case PTRACE_SETOPTIONS: {
2859-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2859+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
28602860
if (tracee) {
28612861
if (!verify_ptrace_options(t, syscall_state)) {
28622862
break;
@@ -2867,7 +2867,7 @@ static Switchable prepare_ptrace(RecordTask* t,
28672867
break;
28682868
}
28692869
case PTRACE_GETEVENTMSG: {
2870-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2870+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
28712871
if (tracee) {
28722872
auto datap =
28732873
syscall_state.reg_parameter<typename Arch::unsigned_long>(4);
@@ -2879,7 +2879,7 @@ static Switchable prepare_ptrace(RecordTask* t,
28792879
break;
28802880
}
28812881
case PTRACE_GETSIGINFO: {
2882-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2882+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
28832883
if (tracee) {
28842884
auto datap = syscall_state.reg_parameter<typename Arch::siginfo_t>(4);
28852885
typename Arch::siginfo_t dest;
@@ -2894,15 +2894,15 @@ static Switchable prepare_ptrace(RecordTask* t,
28942894
case PTRACE_GETREGSET: {
28952895
switch ((int)t->regs().arg3()) {
28962896
case NT_PRSTATUS: {
2897-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2897+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
28982898
if (tracee) {
28992899
auto regs = tracee->regs().get_ptrace_for_arch(tracee->arch());
29002900
ptrace_get_reg_set<Arch>(t, syscall_state, regs);
29012901
}
29022902
break;
29032903
}
29042904
case NT_PRFPREG: {
2905-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2905+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29062906
if (tracee) {
29072907
if (auto extra_regs = tracee->extra_regs_fallible()) {
29082908
auto regs =
@@ -2920,7 +2920,7 @@ static Switchable prepare_ptrace(RecordTask* t,
29202920
emulate = false;
29212921
break;
29222922
}
2923-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2923+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29242924
if (tracee) {
29252925
int syscallno = tracee->regs().original_syscallno();
29262926
uint8_t *data = (uint8_t*)&syscallno;
@@ -2936,7 +2936,7 @@ static Switchable prepare_ptrace(RecordTask* t,
29362936
emulate = false;
29372937
break;
29382938
}
2939-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2939+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29402940
if (tracee) {
29412941
ARM64Arch::user_hwdebug_state bps;
29422942
bool ok = tracee->get_aarch64_debug_regs((int)t->regs().arg3(), &bps);
@@ -2953,7 +2953,7 @@ static Switchable prepare_ptrace(RecordTask* t,
29532953
emulate = false;
29542954
break;
29552955
}
2956-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2956+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29572957
if (tracee) {
29582958
if (auto extra_regs = tracee->extra_regs_fallible()) {
29592959
switch (extra_regs->format()) {
@@ -2982,15 +2982,15 @@ static Switchable prepare_ptrace(RecordTask* t,
29822982
// Task::on_syscall_exit_arch
29832983
switch ((int)t->regs().arg3()) {
29842984
case NT_PRSTATUS: {
2985-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2985+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29862986
if (tracee) {
29872987
ptrace_verify_set_reg_set<Arch>(
29882988
t, user_regs_struct_size(tracee->arch()), syscall_state);
29892989
}
29902990
break;
29912991
}
29922992
case NT_PRFPREG: {
2993-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
2993+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
29942994
if (tracee) {
29952995
ptrace_verify_set_reg_set<Arch>(
29962996
t, user_fpregs_struct_size(tracee->arch()), syscall_state);
@@ -3003,7 +3003,7 @@ static Switchable prepare_ptrace(RecordTask* t,
30033003
emulate = false;
30043004
break;
30053005
}
3006-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3006+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30073007
if (tracee) {
30083008
ptrace_verify_set_reg_set<Arch>(
30093009
t, sizeof(int), syscall_state);
@@ -3017,7 +3017,7 @@ static Switchable prepare_ptrace(RecordTask* t,
30173017
emulate = false;
30183018
break;
30193019
}
3020-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3020+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30213021
if (tracee) {
30223022
ptrace_verify_set_reg_set<Arch>(
30233023
t, offsetof(ARM64Arch::user_hwdebug_state, dbg_regs[0]),
@@ -3031,7 +3031,7 @@ static Switchable prepare_ptrace(RecordTask* t,
30313031
emulate = false;
30323032
break;
30333033
}
3034-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3034+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30353035
if (tracee) {
30363036
if (auto extra_regs = tracee->extra_regs_fallible()) {
30373037
switch (extra_regs->format()) {
@@ -3061,7 +3061,7 @@ static Switchable prepare_ptrace(RecordTask* t,
30613061
case Arch::PTRACE_SYSEMU:
30623062
case Arch::PTRACE_SYSEMU_SINGLESTEP:
30633063
case PTRACE_CONT: {
3064-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3064+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30653065
// If the tracer wants to observe syscall entries, we can't use the
30663066
// syscallbuf, because the tracer may want to change syscall numbers
30673067
// which the syscallbuf code is not prepared to handle. Additionally,
@@ -3082,7 +3082,7 @@ static Switchable prepare_ptrace(RecordTask* t,
30823082
break;
30833083
}
30843084
case PTRACE_DETACH: {
3085-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3085+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30863086
if (tracee) {
30873087
tracee->set_syscallbuf_locked(0);
30883088
tracee->emulated_ptrace_options = 0;
@@ -3095,15 +3095,15 @@ static Switchable prepare_ptrace(RecordTask* t,
30953095
break;
30963096
}
30973097
case PTRACE_KILL: {
3098-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3098+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
30993099
if (tracee) {
31003100
tracee->kill_if_alive();
31013101
syscall_state.emulate_result(0);
31023102
}
31033103
break;
31043104
}
31053105
case PTRACE_INTERRUPT: {
3106-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid, false);
3106+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid, false);
31073107
if (tracee) {
31083108
uint64_t result = 0;
31093109
if (!tracee->is_stopped()) {
@@ -3131,7 +3131,7 @@ static Switchable prepare_ptrace(RecordTask* t,
31313131
break;
31323132
}
31333133
case PTRACE_GET_SYSCALL_INFO: {
3134-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3134+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
31353135
if (tracee) {
31363136
remote_ptr<uint8_t> remote_addr(t->regs().arg4());
31373137
bool ok = true;
@@ -3173,7 +3173,7 @@ static Switchable prepare_ptrace(RecordTask* t,
31733173
}
31743174
case Arch::PTRACE_GET_THREAD_AREA:
31753175
case Arch::PTRACE_SET_THREAD_AREA: {
3176-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3176+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
31773177
if (tracee) {
31783178
if (tracee->arch() != SupportedArch::x86) {
31793179
// This syscall should fail if the tracee is not x86
@@ -3210,7 +3210,7 @@ static Switchable prepare_ptrace(RecordTask* t,
32103210
break;
32113211
}
32123212
case Arch::PTRACE_ARCH_PRCTL: {
3213-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3213+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
32143214
if (tracee) {
32153215
if (tracee->arch() != SupportedArch::x86_64) {
32163216
// This syscall should fail if the tracee is not
@@ -3249,7 +3249,7 @@ static Switchable prepare_ptrace(RecordTask* t,
32493249
}
32503250
case PTRACE_PEEKTEXT:
32513251
case PTRACE_PEEKDATA: {
3252-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3252+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
32533253
if (tracee) {
32543254
// The actual syscall returns the data via the 'data' out-parameter.
32553255
// The behavior of returning the data as the system call result is
@@ -3270,7 +3270,7 @@ static Switchable prepare_ptrace(RecordTask* t,
32703270
}
32713271
case PTRACE_POKETEXT:
32723272
case PTRACE_POKEDATA: {
3273-
RecordTask* tracee = verify_ptrace_target(t, syscall_state, pid);
3273+
RecordTask* tracee = verify_ptrace_target(t, syscall_state, tid);
32743274
if (tracee) {
32753275
remote_ptr<typename Arch::unsigned_word> addr = t->regs().arg3();
32763276
typename Arch::unsigned_word data = t->regs().arg4();

0 commit comments

Comments
 (0)