public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Carlos O'Donell <carlos@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] nis: Fix leak on realloc failure in nis_getnames [BZ #28150]
Date: Mon,  2 Aug 2021 15:24:59 +0000 (GMT)	[thread overview]
Message-ID: <20210802152459.C83F83889C31@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=60698263122b7c54ded3f70a466176e17a529480

commit 60698263122b7c54ded3f70a466176e17a529480
Author: Robbie Harwood <rharwood@redhat.com>
Date:   Wed Jul 28 14:23:32 2021 -0400

    nis: Fix leak on realloc failure in nis_getnames [BZ #28150]
    
    If pos >= count but realloc fails, tmp will not have been placed in
    getnames[pos] yet, and so will not be freed in free_null.  Detected
    by Coverity.
    
    Also remove misleading comment from nis_getnames(), since it actually
    did properly release getnames when out of memory.
    
    Tested-by: Carlos O'Donell <carlos@redhat.com>

Diff:
---
 nis/nis_subr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nis/nis_subr.c b/nis/nis_subr.c
index dd0e30071d..6784fc353f 100644
--- a/nis/nis_subr.c
+++ b/nis/nis_subr.c
@@ -103,9 +103,6 @@ count_dots (const_nis_name str)
   return count;
 }
 
-/* If we run out of memory, we don't give already allocated memory
-   free. The overhead for bringing getnames back in a safe state to
-   free it is to big. */
 nis_name *
 nis_getnames (const_nis_name name)
 {
@@ -271,7 +268,10 @@ nis_getnames (const_nis_name name)
 	      nis_name *newp = realloc (getnames,
 					(count + 1) * sizeof (char *));
 	      if (__glibc_unlikely (newp == NULL))
-		goto free_null;
+		{
+		  free (tmp);
+		  goto free_null;
+		}
 	      getnames = newp;
 	    }
 	  getnames[pos] = tmp;


                 reply	other threads:[~2021-08-02 15:24 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=20210802152459.C83F83889C31@sourceware.org \
    --to=carlos@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: 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).