From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7xnS-0004pA-Vx for barebox@lists.infradead.org; Tue, 18 Aug 2020 09:20:48 +0000 From: Sascha Hauer Date: Tue, 18 Aug 2020 11:20:39 +0200 Message-Id: <20200818092039.2521-1-s.hauer@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] libfile: copy_file: Fix ftruncate called on device files To: Barebox List Cc: Bastian Krause ftruncate may only be called on regular files. This became broken in a5f73a6dcd. Revert to the previous behaviour and pass O_TRUNC to the initial open() call instead of truncating it with ftruncate(). Also we can call ftruncate() to the final size also when the file previously didn't exist. Fixes: a5f73a6dcd ("libfile: copy_file: explicitly truncate to final size") Reported-by: Bastian Krause Signed-off-by: Sascha Hauer --- lib/libfile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libfile.c b/lib/libfile.c index 863b6833a5..20bb689a79 100644 --- a/lib/libfile.c +++ b/lib/libfile.c @@ -353,6 +353,10 @@ int copy_file(const char *src, const char *dst, int verbose) goto out; } + /* Set O_TRUNC only if file exists and is a regular file */ + if (!s && S_ISREG(dststat.st_mode)) + mode |= O_TRUNC; + dstfd = open(dst, mode); if (dstfd < 0) { printf("could not open %s: %s\n", dst, errno_str()); @@ -360,17 +364,13 @@ int copy_file(const char *src, const char *dst, int verbose) goto out; } - ret = ftruncate(dstfd, 0); - if (ret) - goto out; - ret = stat(src, &srcstat); if (ret) goto out; if (srcstat.st_size != FILESIZE_MAX) { discard_range(dstfd, srcstat.st_size, 0); - if (S_ISREG(dststat.st_mode)) { + if (s || S_ISREG(dststat.st_mode)) { ret = ftruncate(dstfd, srcstat.st_size); if (ret) goto out; -- 2.28.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox