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

2005-02-05 Roland McGrath <roland@redhat.com>

Browse Source 
* desc.c (decode_select): Calculate size of passed fd_set vectors and
	copy in the user's size rather than the standard sizeof(fd_set).
	Fixes Debian bug #65654.
This commit is contained in:
Roland McGrath
2005-02-06 01:55:12 +00:00
parent 371ed8fcec
commit e85aaa459a
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
desc.c
View File

@ -405,7 +405,9 @@ long *args;
int bitness; int bitness;
{ {
int i, j, nfds; int i, j, nfds;
fd_set fds; unsigned int fdsize = ((((args[0] + 7) / 8) + sizeof(long) - 1)
& -sizeof(long));
fd_set *fds;
struct timeval tv; struct timeval tv;
#ifdef ALPHA #ifdef ALPHA
struct timeval32 { struct timeval32 {
@ -418,6 +420,11 @@ int bitness;
long arg; long arg;
if (entering(tcp)) { if (entering(tcp)) {
fds = (fd_set *) malloc(fdsize);
if (fds == NULL) {
tprintf("out of memory\n");
return 0;
}
nfds = args[0]; nfds = args[0];
tprintf("%d", nfds); tprintf("%d", nfds);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -430,19 +437,20 @@ int bitness;
tprintf(", %#lx", arg); tprintf(", %#lx", arg);
continue; continue;
} }
if (umove(tcp, arg, &fds) < 0) { if (umoven(tcp, arg, fdsize, (char *) fds) < 0) {
tprintf(", [?]"); tprintf(", [?]");
continue; continue;
} }
tprintf(", ["); tprintf(", [");
for (j = 0, sep = ""; j < nfds; j++) { for (j = 0, sep = ""; j < nfds; j++) {
if (FD_ISSET(j, &fds)) { if (FD_ISSET(j, fds)) {
tprintf("%s%u", sep, j); tprintf("%s%u", sep, j);
sep = " "; sep = " ";
} }
} }
tprintf("]"); tprintf("]");
} }
free(fds);
if (!args[4]) if (!args[4])
tprintf(", NULL"); tprintf(", NULL");
else if (!verbose(tcp)) else if (!verbose(tcp))
@ -472,6 +480,13 @@ int bitness;
tcp->auxstr = "Timeout"; tcp->auxstr = "Timeout";
return RVAL_STR; return RVAL_STR;
} }
fds = (fd_set *) malloc(fdsize);
if (fds == NULL) {
tprintf("out of memory\n");
return 0;
}
outstr[0] = '\0'; outstr[0] = '\0';
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
int first = 1; int first = 1;
@ -479,10 +494,10 @@ int bitness;
tcp->auxstr = outstr; tcp->auxstr = outstr;
arg = args[i+1]; arg = args[i+1];
if (!arg || umove(tcp, arg, &fds) < 0) if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
continue; continue;
for (j = 0; j < args[0]; j++) { for (j = 0; j < args[0]; j++) {
if (FD_ISSET(j, &fds)) { if (FD_ISSET(j, fds)) {
if (first) { if (first) {
sprintf(str, "%s%s [%u", sep, sprintf(str, "%s%s [%u", sep,
i == 0 ? "in" : i == 0 ? "in" :
@ -504,6 +519,7 @@ int bitness;
if (nfds == 0) if (nfds == 0)
break; break;
} }
free(fds);
#ifdef LINUX #ifdef LINUX
/* This contains no useful information on SunOS. */ /* This contains no useful information on SunOS. */
if (args[4]) { if (args[4]) {