Roll back "die on malloc failure" behaviour a bit
After recent change, select(2^31-1, NULL, NULL, NULL)
would make strace exit. This change caps fdsize so that
it is always in [0, 1025*1024], IOW: we will try to allocate at most
1 megabyte, which in practice will almost always work,
unlike malloc(2Gig).
* desc.c (decode_select): Cap fdsize to 1024*1024.
* pathtrace.c (pathtrace_match): Cap fdsize to 1024*1024.
* file.c (sys_getdents): Cap len to 1024*1024.
(sys_getdents64): Cap len to 1024*1024.
* util.c (dumpiov): Refuse to process iov with more than 1024*1024
elements. Don't die on malloc failure.
(dumpstr): Don't die on malloc failure.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
diff --git a/pathtrace.c b/pathtrace.c
index 23ab47e..380363c 100644
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -269,7 +269,8 @@
s->sys_func == sys_oldselect ||
s->sys_func == sys_pselect6)
{
- int i, j, nfds;
+ int i, j;
+ unsigned nfds;
long *args, oldargs[5];
unsigned fdsize;
fd_set *fds;
@@ -286,10 +287,14 @@
args = tcp->u_arg;
nfds = args[0];
+ /* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
+ if (args[0] > 1024*1024)
+ nfds = 1024*1024;
+ if (args[0] < 0)
+ nfds = 0;
fdsize = ((((nfds + 7) / 8) + sizeof(long) - 1)
& -sizeof(long));
fds = malloc(fdsize);
-
if (!fds)
die_out_of_memory();