From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix svc_run
Date: Mon, 27 Nov 2006 19:11:00 -0000 [thread overview]
Message-ID: <20061127191041.GA3484@sunsite.mff.cuni.cz> (raw)
Hi!
svc_run segfaults if malloc fails.
BZ#3559 contains a simple patch (just perror and return if that fails),
this is a little bit larger patch which avoids dumb my_pollfd allocation and
freeing in every single svc_run loop iteration if svc_max_pollfd hasn't
changed.
2006-11-27 Jakub Jelinek <jakub@redhat.com>
[BZ #3559]
* sunrpc/svc_run.c (svc_run): Fail instead of segfaulting if
malloc crashed. Don't allocate memory unnecessarily in each
loop.
--- libc/sunrpc/svc_run.c.jj 2002-05-15 02:21:01.000000000 +0200
+++ libc/sunrpc/svc_run.c 2006-11-27 15:28:31.000000000 +0100
@@ -51,36 +51,51 @@ void
svc_run (void)
{
int i;
+ struct pollfd *my_pollfd = NULL;
+ int last_max_pollfd = 0;
for (;;)
{
- struct pollfd *my_pollfd;
+ int max_pollfd = svc_max_pollfd;
+ if (max_pollfd == 0 && svc_pollfd == NULL)
+ break;
- if (svc_max_pollfd == 0 && svc_pollfd == NULL)
- return;
+ if (last_max_pollfd != max_pollfd)
+ {
+ struct pollfd *new_pollfd
+ = realloc (my_pollfd, sizeof (struct pollfd) * max_pollfd);
+
+ if (new_pollfd == NULL)
+ {
+ perror (_("svc_run: - out of memory"));
+ break;
+ }
+
+ last_max_pollfd = max_pollfd;
+ }
- my_pollfd = malloc (sizeof (struct pollfd) * svc_max_pollfd);
- for (i = 0; i < svc_max_pollfd; ++i)
+ for (i = 0; i < max_pollfd; ++i)
{
my_pollfd[i].fd = svc_pollfd[i].fd;
my_pollfd[i].events = svc_pollfd[i].events;
my_pollfd[i].revents = 0;
}
- switch (i = __poll (my_pollfd, svc_max_pollfd, -1))
+ switch (i = __poll (my_pollfd, max_pollfd, -1))
{
case -1:
- free (my_pollfd);
if (errno == EINTR)
continue;
perror (_("svc_run: - poll failed"));
- return;
+ break;
case 0:
- free (my_pollfd);
continue;
default:
INTUSE(svc_getreq_poll) (my_pollfd, i);
- free (my_pollfd);
+ continue;
}
+ break;
}
+
+ free (my_pollfd);
}
Jakub
next reply other threads:[~2006-11-27 19:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-27 19:11 Jakub Jelinek [this message]
2006-11-30 13:44 ` [PATCH] Fix last svc_run change Jakub Jelinek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061127191041.GA3484@sunsite.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).