glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pathmatch of oldselect syscall on 64-bit architectures

Browse Source 
* pathtrace.c (pathtrace_match): Fix fetching of 32-bit oldselect
arguments on 64-bit architectures.
This commit is contained in:
Дмитрий Левин 2016-12-19 11:49:58 +00:00
parent 4cb2d29f2f
commit ed256d30ee
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pathtrace.c
View File

@ -248,19 +248,31 @@ pathtrace_match(struct tcb *tcp)
{
int i, j;
int nfds;
long *args, oldargs[5];
unsigned fdsize;
long *args;
long select_args[5];
unsigned int oldselect_args[5];
unsigned int fdsize;
fd_set *fds;
args = tcp->u_arg;
if (SEN_oldselect == s->sen) {
if (umoven(tcp, tcp->u_arg[0], sizeof oldargs,
oldargs) < 0)
{
error_msg("umoven() failed");
return 0;
if (sizeof(*select_args) == sizeof(*oldselect_args)) {
if (umove(tcp, tcp->u_arg[0], &select_args)) {
return 0;
}
} else {
unsigned int n;
if (umove(tcp, tcp->u_arg[0], &oldselect_args)) {
return 0;
}
for (n = 0; n < 5; ++n) {
select_args[n] = oldselect_args[n];
}
}
args = oldargs;
args = select_args;
} else {
args = tcp->u_arg;
}
/* Kernel truncates arg[0] to int, we do the same. */
@ -278,7 +290,6 @@ pathtrace_match(struct tcb *tcp)
if (args[i] == 0)
continue;
if (umoven(tcp, args[i], fdsize, fds) < 0) {
error_msg("umoven() failed");
continue;
}
for (j = 0;; j++) {
@ -311,7 +322,7 @@ pathtrace_match(struct tcb *tcp)
return 0;
for (cur = start; cur < end; cur += sizeof(fds))
if ((umoven(tcp, cur, sizeof fds, &fds) == 0)
if ((umove(tcp, cur, &fds) == 0)
&& fdmatch(tcp, fds.fd))
return 1;