unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Robbie Harwood via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org, fweimer@redhat.com
Cc: Robbie Harwood <rharwood@redhat.com>
Subject: [PATCH v2 1/1] nis: Fix leak on realloc failure in nis_getnames [BZ #28150]
Date: Wed, 28 Jul 2021 14:23:32 -0400	[thread overview]
Message-ID: <20210728182331.1363922-1-rharwood@redhat.com> (raw)
In-Reply-To: <87k0la71tp.fsf@oldenburg.str.redhat.com>

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.
---
 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;
-- 
2.32.0


  reply	other threads:[~2021-07-28 18:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28 17:47 [PATCH v1] nis: Fix leak on realloc failure in nis_getnames Robbie Harwood via Libc-alpha
2021-07-28 18:03 ` Florian Weimer via Libc-alpha
2021-07-28 18:23   ` Robbie Harwood via Libc-alpha [this message]
2021-08-02 15:24     ` [PATCH v2 1/1] nis: Fix leak on realloc failure in nis_getnames [BZ #28150] Carlos O'Donell via Libc-alpha
2021-07-28 18:06 ` [PATCH v1] nis: Fix leak on realloc failure in nis_getnames Robbie Harwood via Libc-alpha

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

  List information: https://www.gnu.org/software/libc/involved.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210728182331.1363922-1-rharwood@redhat.com \
    --to=libc-alpha@sourceware.org \
    --cc=fweimer@redhat.com \
    --cc=rharwood@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).