From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 Apr 2023 08:58:24 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1poIoh-00612U-Ik for lore@lore.pengutronix.de; Mon, 17 Apr 2023 08:58:24 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1poIoh-0002Jq-6K for lore@pengutronix.de; Mon, 17 Apr 2023 08:58:23 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BQgWiDmlQbgLlGI5mEuzMiyp9mZBR7I6KBreNvCwFLM=; b=zJFLZtcsndNcHVmlqJNwKmn4AB c537sNiwmX3l+UTDpcKtZvySEe38+zDz4yUsQwgS41CoFJmLXvE9EbhhAhxZwWl3yU+fvAdXdP7wX ixGrmYREfp+u5IyRA78dh7fBwgb5gLIQ9V1Z5q8JCEAOQKahqvP8K0JKYuQQ8hMeSfZPeSLyLvKrb yp5t3MS1EQa4Z4hSrzVqliytV12YkUBzCa+JOXND34NcKVkluF9HQAeMfrZ0ZniqTqIgwRntmXjmt pZrDUTvX8gWCORko19Rz+k4iFYC3pHEyRxn/TNYV4uvCWYFqkv5vwbGyroCbyBaVrpnz2Ytn+ktzX VLWqZbpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1poInW-00F78f-1o; Mon, 17 Apr 2023 06:57:10 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1poInT-00F787-2g for barebox@lists.infradead.org; Mon, 17 Apr 2023 06:57:09 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1poInS-00020R-BB; Mon, 17 Apr 2023 08:57:06 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1poInS-0004P2-2N; Mon, 17 Apr 2023 08:57:06 +0200 Date: Mon, 17 Apr 2023 08:57:06 +0200 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20230417065706.GF13543@pengutronix.de> References: <20230414152032.3783908-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230414152032.3783908-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230416_235707_872606_BAE22FB9 X-CRM114-Status: GOOD ( 21.75 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH master] libfile: don't leak file descriptors in compare_file X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Fri, Apr 14, 2023 at 05:20:32PM +0200, Ahmad Fatoum wrote: > Depending on the state of environment, running > > while saveenv; do true; done > > Can quickly lead to: > > saving environment > could not open /dev/mmc2.barebox-environment: error 24 > saveenv: error 24 > > Because the leaked file descriptors gobble up the 128 we have > preallocated. Fix this. > > Signed-off-by: Ahmad Fatoum > --- > lib/libfile.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Applied, thanks Sascha > > diff --git a/lib/libfile.c b/lib/libfile.c > index b967232d198e..ebd1de3d8e4d 100644 > --- a/lib/libfile.c > +++ b/lib/libfile.c > @@ -542,8 +542,10 @@ int compare_file(const char *f1, const char *f2) > if (ret) > goto err_out2; > > - if (s1.st_size != s2.st_size) > - return 1; > + if (s1.st_size != s2.st_size) { > + ret = 1; > + goto err_out2; > + } > > buf1 = xmalloc(RW_BUF_SIZE); > buf2 = xmalloc(RW_BUF_SIZE); > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |