From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 30ACD65D56 for ; Thu, 5 Nov 2020 10:34:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 26EC415D22 for ; Thu, 5 Nov 2020 10:34:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 265EA15D18 for ; Thu, 5 Nov 2020 10:34:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DA61F45E6B for ; Thu, 5 Nov 2020 10:34:25 +0100 (CET) Date: Thu, 5 Nov 2020 10:34:25 +0100 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20201105093425.gt6qrmy4xdqmg7lk@olga.proxmox.com> References: <20201105081743.7091-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201105081743.7091-1-d.csapak@proxmox.com> User-Agent: NeoMutt/20180716 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.rs] Subject: [pbs-devel] applied: [PATCH proxmox-backup] pxar/create: fix endless loop for shrinking files X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2020 09:34:27 -0000 On Thu, Nov 05, 2020 at 09:17:43AM +0100, Dominik Csapak wrote: > when a file shrunk during backup, we endlessly looped, reading/copying 0 bytes > we already have code that handles shrunk files, but we forgot to > break from the read loop > > Signed-off-by: Dominik Csapak > --- > src/pxar/create.rs | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/pxar/create.rs b/src/pxar/create.rs > index 6ba6f15c..f4c735d0 100644 > --- a/src/pxar/create.rs > +++ b/src/pxar/create.rs > @@ -661,6 +661,8 @@ impl<'a, 'b> Archiver<'a, 'b> { > if got as u64 > remaining { > self.report_file_grew_while_reading()?; > got = remaining as usize; > + } else if got == 0 { > + break; // we reached eof > } > out.write_all(&self.file_copy_buffer[..got])?; > remaining -= got as u64; > -- > 2.20.1