From patchwork Wed Jul 28 18:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robbie Harwood X-Patchwork-Id: 44505 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3AD0839A3C03 for ; Wed, 28 Jul 2021 18:24:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AD0839A3C03 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1627496650; bh=swiy1ytiazkZoqyDPEM9dw7sh1m3WQ6tYjhrAwopEio=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=t8mTQovlOayrrk7VN9PYgx9t8An5qeGNUDaEvViaMcDjOwbW+Enp5DC3j+DiKs2tO 6IkRDk+LrNcM1WYzVINLK69aPLSv0Ky6nKLr6+0ST5aM67vTAFhbGG9bXU91eft4ZP PRxMbr2NKbAJ/5CzwXvG5fr2D7swuyelOr/5N7yE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 8CFB93851C34 for ; Wed, 28 Jul 2021 18:23:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8CFB93851C34 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-451-vVshp89WOgSIEaHlgCcX-g-1; Wed, 28 Jul 2021 14:23:47 -0400 X-MC-Unique: vVshp89WOgSIEaHlgCcX-g-1 Received: by mail-qv1-f71.google.com with SMTP id cb3-20020ad456230000b02903319321d1e3so2449599qvb.14 for ; Wed, 28 Jul 2021 11:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swiy1ytiazkZoqyDPEM9dw7sh1m3WQ6tYjhrAwopEio=; b=YxgQbY/CcZCqYOKAZjBACfuajMFMkxNzIhaKeXJ4wrWrHeHDIuYW9d2a5wxGrPH3uP oiJu5UqYUD4w4gUFOQpOx9huqtsDf40h90Qx8A3WGPEGtxvV16h3/ymC+2dKNuXP183R 5nVI38AIjXXD4s6GCPgXDVlGkpjf4DDGHGbo1nmUWBZJBK2m/w2v2AvvWGECGH6K2khw zU70IZ0PSunt3e/FXRChJrC2MjB1cbEjfw8Gwv2SXebcvPJvl1tD3PPDp5IprVHJAYbs Vt3VH3UxaXHvoiWnRQUytbCwbtNAw9+cav0g6xrFgyIr55iacyifhTbX/YLtLYgwAxpK X0Cw== X-Gm-Message-State: AOAM531fGpRDcuyD4Js2WWYzpLAMODnDfKwsomXPlVD1Mx09muQagIID 6cyK6ZhCEJudPr5ei4aMqxEfZqYpbmJaDndxf2+aN8LnUlhQkKC32RCJ1Kj94ffd9sZcFrGruM4 aZcQ/i8s4QETc+tuowMlnxvYYj+vwYy6Venggkjgme+Cx3ij2BbBp4josjJ/Tbhe9J3C2kdiK X-Received: by 2002:a05:620a:a10:: with SMTP id i16mr981127qka.379.1627496626447; Wed, 28 Jul 2021 11:23:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd4a/KyCv8C6KtMW+oMjto68hKb9urMjvlsGETa2OxBCxOTjcTA6Qp3sEWna+BqQu/R+vjPw== X-Received: by 2002:a05:620a:a10:: with SMTP id i16mr981100qka.379.1627496626080; Wed, 28 Jul 2021 11:23:46 -0700 (PDT) Received: from localhost (c-71-232-17-31.hsd1.ma.comcast.net. [71.232.17.31]) by smtp.gmail.com with ESMTPSA id f15sm263731qtv.60.2021.07.28.11.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 11:23:45 -0700 (PDT) To: libc-alpha@sourceware.org, fweimer@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 Message-Id: <20210728182331.1363922-1-rharwood@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <87k0la71tp.fsf@oldenburg.str.redhat.com> References: <87k0la71tp.fsf@oldenburg.str.redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Robbie Harwood via Libc-alpha From: Robbie Harwood Reply-To: Robbie Harwood Cc: Robbie Harwood Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 --- 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;