public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Siddhesh Poyarekar <siddhesh@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] inet: Free result from getaddrinfo Date: Thu, 13 May 2021 02:36:20 +0000 (GMT) [thread overview] Message-ID: <20210513023620.8EF1D3844054@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7eeb05a3958407675d3c4c5351d8ed7738156fbf commit 7eeb05a3958407675d3c4c5351d8ed7738156fbf Author: Siddhesh Poyarekar <siddhesh@sourceware.org> Date: Wed May 12 16:50:59 2021 +0530 inet: Free result from getaddrinfo Coverity discovered paths where the result from getaddrinfo was not freed. Diff: --- inet/rcmd.c | 1 + inet/rexec.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/inet/rcmd.c b/inet/rcmd.c index 452ff7d099..0cfdaee15e 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -153,6 +153,7 @@ rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser, free (ahostbuf); ahostbuf = __strdup (res->ai_canonname); if (ahostbuf == NULL) { + freeaddrinfo (res); __fxprintf(NULL, "%s", _("rcmd: Cannot allocate memory\n")); return -1; diff --git a/inet/rexec.c b/inet/rexec.c index bda536723b..064e979d68 100644 --- a/inet/rexec.c +++ b/inet/rexec.c @@ -76,13 +76,13 @@ rexec_af (char **ahost, int rport, const char *name, const char *pass, ahostbuf = __strdup (res0->ai_canonname); if (ahostbuf == NULL) { perror ("rexec: strdup"); - return (-1); + goto bad2; } *ahost = ahostbuf; } else { *ahost = NULL; __set_errno (ENOENT); - return -1; + goto bad2; } ruserpass(res0->ai_canonname, &name, &pass); retry: @@ -90,7 +90,7 @@ retry: s = __socket(res0->ai_family, res0->ai_socktype, 0); if (s < 0) { perror("rexec: socket"); - return (-1); + goto bad2; } if (__connect(s, res0->ai_addr, res0->ai_addrlen) < 0) { if (errno == ECONNREFUSED && timo <= 16) { @@ -100,7 +100,7 @@ retry: goto retry; } perror(res0->ai_canonname); - return (-1); + goto bad; } if (fd2p == 0) { (void) __write(s, "", 1); @@ -116,10 +116,9 @@ retry: socklen_t sa2len; s2 = __socket(res0->ai_family, res0->ai_socktype, 0); - if (s2 < 0) { - (void) __close(s); - return (-1); - } + if (s2 < 0) + goto bad; + __listen(s2, 1); sa2len = sizeof (sa2); if (__getsockname(s2, &sa2.sa, &sa2len) < 0) { @@ -185,6 +184,7 @@ bad: if (port) (void) __close(*fd2p); (void) __close(s); +bad2: freeaddrinfo(res0); return (-1); }
reply other threads:[~2021-05-13 2:36 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210513023620.8EF1D3844054@sourceware.org \ --to=siddhesh@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /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: linkBe 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).