From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755423AbcHXOZo (ORCPT ); Wed, 24 Aug 2016 10:25:44 -0400 Received: from mail.kernel.org ([198.145.29.136]:56712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753783AbcHXOZm (ORCPT ); Wed, 24 Aug 2016 10:25:42 -0400 Date: Wed, 24 Aug 2016 11:25:04 -0300 From: Arnaldo Carvalho de Melo To: Shawn Lin Cc: Ingo Molnar , Peter Zijlstra , linux-kernel@vger.kernel.org Subject: Re: [PATCH] perf tools: Fix error handling of lzma decompression Message-ID: <20160824142504.GD10063@kernel.org> References: <1471766253-1964-1-git-send-email-shawn.lin@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1471766253-1964-1-git-send-email-shawn.lin@rock-chips.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sun, Aug 21, 2016 at 03:57:33PM +0800, Shawn Lin escreveu: > lzma_decompress_to_file never actually close the file > pointer, let's fix it. > > Signed-off-by: Shawn Lin Thanks, I changed the logic a bit to shorten the patch, this is how it ended up: commit ffe67c2fabf128122b30fbf0ac498928e171b0b3 Author: Shawn Lin Date: Sun Aug 21 15:57:33 2016 +0800 perf tools: Fix error handling of lzma decompression lzma_decompress_to_file() never actually closes the file pointer, let's fix it. Signed-off-by: Shawn Lin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1471766253-1964-1-git-send-email-shawn.lin@rock-chips.com [ Make err = -1, the common case, set it to 0 before the error label ] Signed-off-by: Arnaldo Carvalho de Melo diff --git a/tools/perf/util/lzma.c b/tools/perf/util/lzma.c index 95a1acb61245..9ddea5cecd94 100644 --- a/tools/perf/util/lzma.c +++ b/tools/perf/util/lzma.c @@ -29,6 +29,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) lzma_action action = LZMA_RUN; lzma_stream strm = LZMA_STREAM_INIT; lzma_ret ret; + int err = -1; u8 buf_in[BUFSIZE]; u8 buf_out[BUFSIZE]; @@ -45,7 +46,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) if (ret != LZMA_OK) { pr_err("lzma: lzma_stream_decoder failed %s (%d)\n", lzma_strerror(ret), ret); - return -1; + goto err_fclose; } strm.next_in = NULL; @@ -60,7 +61,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) if (ferror(infile)) { pr_err("lzma: read error: %s\n", strerror(errno)); - return -1; + goto err_fclose; } if (feof(infile)) @@ -74,7 +75,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) if (writen(output_fd, buf_out, write_size) != write_size) { pr_err("lzma: write error: %s\n", strerror(errno)); - return -1; + goto err_fclose; } strm.next_out = buf_out; @@ -83,13 +84,15 @@ int lzma_decompress_to_file(const char *input, int output_fd) if (ret != LZMA_OK) { if (ret == LZMA_STREAM_END) - return 0; + break; pr_err("lzma: failed %s\n", lzma_strerror(ret)); - return -1; + goto err_fclose; } } + err = 0; +err_fclose: fclose(infile); - return 0; + return err; } > > tools/perf/util/lzma.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/util/lzma.c b/tools/perf/util/lzma.c > index 95a1acb..a95d473 100644 > --- a/tools/perf/util/lzma.c > +++ b/tools/perf/util/lzma.c > @@ -29,6 +29,7 @@ int lzma_decompress_to_file(const char *input, int output_fd) > lzma_action action = LZMA_RUN; > lzma_stream strm = LZMA_STREAM_INIT; > lzma_ret ret; > + int err = 0; > > u8 buf_in[BUFSIZE]; > u8 buf_out[BUFSIZE]; > @@ -45,7 +46,8 @@ int lzma_decompress_to_file(const char *input, int output_fd) > if (ret != LZMA_OK) { > pr_err("lzma: lzma_stream_decoder failed %s (%d)\n", > lzma_strerror(ret), ret); > - return -1; > + err = -1; > + goto err_fclose; > } > > strm.next_in = NULL; > @@ -60,7 +62,8 @@ int lzma_decompress_to_file(const char *input, int output_fd) > > if (ferror(infile)) { > pr_err("lzma: read error: %s\n", strerror(errno)); > - return -1; > + err = -1; > + goto err_fclose; > } > > if (feof(infile)) > @@ -74,7 +77,8 @@ int lzma_decompress_to_file(const char *input, int output_fd) > > if (writen(output_fd, buf_out, write_size) != write_size) { > pr_err("lzma: write error: %s\n", strerror(errno)); > - return -1; > + err = -1; > + goto err_fclose; > } > > strm.next_out = buf_out; > @@ -83,13 +87,14 @@ int lzma_decompress_to_file(const char *input, int output_fd) > > if (ret != LZMA_OK) { > if (ret == LZMA_STREAM_END) > - return 0; > + goto err_fclose; > > pr_err("lzma: failed %s\n", lzma_strerror(ret)); > - return -1; > + err = -1; > + goto err_fclose; > } > } > - > +err_fclose: > fclose(infile); > - return 0; > + return err; > } > -- > 2.3.7 >