From c8a26925c974fa91c3a4e53f1a3bfd7bf57bcf98 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 14 Aug 2015 13:31:58 -0700 Subject: lib: libfile: Do not ignore errors in close() Some character devices may perform meaningful operations in their implementation of close() -- a good example would be socfpga.c which checks if the FPGA was programmed succesfully in it's close() method -- so ignoring return value of this call may cause false positives in checking exit status for success. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- lib/libfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/libfile.c b/lib/libfile.c index ba03700aba..a27460c10d 100644 --- a/lib/libfile.c +++ b/lib/libfile.c @@ -262,7 +262,7 @@ int copy_file(const char *src, const char *dst, int verbose) char *rw_buf = NULL; int srcfd = 0, dstfd = 0; int r, w; - int ret = 1; + int ret = 1, err1 = 0; void *buf; int total = 0; struct stat statbuf; @@ -326,9 +326,9 @@ out: if (srcfd > 0) close(srcfd); if (dstfd > 0) - close(dstfd); + err1 = close(dstfd); - return ret; + return ret ?: err1; } EXPORT_SYMBOL(copy_file); -- cgit v1.2.3