From owner-svn-src-stable-10@freebsd.org  Wed Feb 13 09:28:50 2019
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0549E14E92A6;
 Wed, 13 Feb 2019 09:28:50 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 97F0880E97;
 Wed, 13 Feb 2019 09:28:49 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88EE225496;
 Wed, 13 Feb 2019 09:28:49 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1D9Sne9075577;
 Wed, 13 Feb 2019 09:28:49 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1D9Snsr075576;
 Wed, 13 Feb 2019 09:28:49 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201902130928.x1D9Snsr075576@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Wed, 13 Feb 2019 09:28:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r344091 - in stable: 10/sbin/recoverdisk
 11/sbin/recoverdisk 12/sbin/recoverdisk
X-SVN-Group: stable-10
X-SVN-Commit-Author: avos
X-SVN-Commit-Paths: in stable: 10/sbin/recoverdisk 11/sbin/recoverdisk
 12/sbin/recoverdisk
X-SVN-Commit-Revision: 344091
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 97F0880E97
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.93 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.995,0];
 NEURAL_HAM_SHORT(-0.93)[-0.934,0];
 NEURAL_HAM_LONG(-1.00)[-0.999,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Feb 2019 09:28:50 -0000

Author: avos
Date: Wed Feb 13 09:28:48 2019
New Revision: 344091
URL: https://svnweb.freebsd.org/changeset/base/344091

Log:
  MFC r343871:
  recoverdisk(1): fclose() file supplied via '-r readlist' parameter when
  it's no longer needed
  
  PR:		204952
  Reported by:	David Binderman <dcb314@hotmail.com>

Modified:
  stable/10/sbin/recoverdisk/recoverdisk.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sbin/recoverdisk/recoverdisk.c
  stable/12/sbin/recoverdisk/recoverdisk.c
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/sbin/recoverdisk/recoverdisk.c
==============================================================================
--- stable/10/sbin/recoverdisk/recoverdisk.c	Wed Feb 13 09:03:23 2019	(r344090)
+++ stable/10/sbin/recoverdisk/recoverdisk.c	Wed Feb 13 09:28:48 2019	(r344091)
@@ -123,6 +123,7 @@ read_worklist(off_t t)
 		new_lump(s, l, state);
 		d -= l;
 	}
+	fclose(file);
 	(void)fprintf(stderr, " done.\n");
 	/*
 	 * Return the number of bytes already read