From patchwork Tue Jan 21 18:41:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1226701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108890-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=g9QGi7gT; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GJVtwvXV; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 482HTB6NLqz9sNF for ; Wed, 22 Jan 2020 05:42:22 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=KFg+HrG3ZNTFyVEJ AINDbJty5J9Cc2kr2Bu3RF4M7h2KcYJUp2x1wvNWwD+KIeNqs15qHP0cWwpztklM q00VJD+/tRE5f43600rkvzlKy0UD080ifQKxHbNuFXqkC6K3V29NC0jBQZ1r5Dzz +SX3bYTJFJBXSlsLeRQh6hfHmTY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:in-reply-to:references :message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=CbpC1vu7XlmiY764bRO4Zt 8aJ/4=; b=g9QGi7gTNtbS1Jw8z6zk7ED8ub5aODSvJ8E7YUidYKniOQqn2/oJXc 97oIWLLzh/cOopDn0pU2n0Dbdnu1vSZfVNrK1QV8XpBVwbj9Ts0IYhEthPRcQd9L 0jQ4xkbCccuysS6z6RssxLYWgwAL/h4/TeLfVgHPrvM0Vsp/2CeFg= Received: (qmail 93626 invoked by alias); 21 Jan 2020 18:42:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 93540 invoked by uid 89); 21 Jan 2020 18:42:04 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=21475, Lift, lift X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579632121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U2hSV7vcZa+U8O4Nnu6qEWkeZbphT/cpRwm/UNy63jE=; b=GJVtwvXVvy8VaMs1G46BQWLBlCyieEY7ziaeg5LghH7qaH2SxqN8bVNFdOM+NW1d5Q0OYo 6cT4hT35WBT3xaSMUvvcVC9doTHymq74EV6OPPqu2smqOmdJG1rJPlbr327MCjAhDRKThj 7Bqjp5ItZQPkU69woKfI39sCkQ84OKs= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 3/5] resolv: Fix file handle leak in __resolv_conf_load [BZ #25429] In-Reply-To: References: Message-Id: <4d8628bf1d8630c16de30d47732058ec82293429.1579631655.git.fweimer@redhat.com> Date: Tue, 21 Jan 2020 19:41:55 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com res_vinit_1 did not close the stream on errors, only on success. This change moves closing the stream to __resolv_conf_load, for both the success and error cases. Fixes commit 89f187a40fc0ad4e22838526bfe34d73f758b776 ("resolv: Use getline for configuration file reading in res_vinit_1") and commit 3f853f22c87f0b671c0366eb290919719fa56c0e ("resolv: Lift domain search list limits [BZ #19569] [BZ #21475]"), where memory allocation was introduced into res_vinit_1. Reviewed-by: Adhemerval Zanella --- resolv/res_init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resolv/res_init.c b/resolv/res_init.c index 95dce098aa..09345718cd 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -508,7 +508,6 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser) continue; } } - fclose (fp); } if (__glibc_unlikely (nameserver_list_size (&parser->nameserver_list) == 0)) { @@ -593,6 +592,13 @@ __resolv_conf_load (struct __res_state *preinit) } resolv_conf_parser_free (&parser); + if (fp != NULL) + { + int saved_errno = errno; + fclose (fp); + __set_errno (saved_errno); + } + return conf; }