From patchwork Wed Mar 16 13:45:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 598386 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qQCXj2KCtz9sRB for ; Thu, 17 Mar 2016 00:49:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=f+tZRF6y; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 915F9B3870; Wed, 16 Mar 2016 14:47:39 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BxFWxx7Kep_b; Wed, 16 Mar 2016 14:47:39 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1A188B384F; Wed, 16 Mar 2016 14:46:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76BFDA768A for ; Wed, 16 Mar 2016 14:46:21 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l4pL3thjTtuI for ; Wed, 16 Mar 2016 14:46:21 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) by theia.denx.de (Postfix) with ESMTPS id 75829B3815 for ; Wed, 16 Mar 2016 14:45:58 +0100 (CET) Received: by mail-io0-f182.google.com with SMTP id g203so59564090iof.2 for ; Wed, 16 Mar 2016 06:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5kik+MJTpcaoC61fWesupk49ZH3M4abwgHYtCtCNyX4=; b=f+tZRF6yTjKOqfxZi+WDyZMmU1/mEP7slOf6rIRRmrW9Y+qp5+vMDf9jIV0uELBbSR wE6tyRDnX05ZPBmC9LR53GwgxFH7oAPlYnd/a1IaB9e4LVDziLrxIQ8di0QoQq4P/ixK raemC8EYNxVLBiG5DHEanTKKjJGSDeeaGjvtzsRZoN8OGHufYRqmyoWGM6ynnQPoVlyP mQU54t0e/DTkrgQOy81GoEBpX9wfyjPDb4Ivx4aljZO/rGHD3XU7H5YkUD/zDrOkWDF2 Ef7uDbC2vXIQThSmD3AAgYFh9BsywmsZL/Y0ooMuLGcsUA3qIJQxkLGYH/hPpphrJ4aj d2Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5kik+MJTpcaoC61fWesupk49ZH3M4abwgHYtCtCNyX4=; b=gtTfdXebGuHhubaDTuMpVl/6mAGdahi1sZUgRglvRUDXOZJ+EsZUDgQz1G1Nuy9wli OICLRZyI0Z+bdmwJprj+VJoxoIHFGTV/Ozz6LomRq5vtjvnGf1feaS/3q4iRjbYcBh/O pFdfiPOGmN1bm0CW2h+fw8GMb/JctAhG+97XG0AzvbpnQ3fstSuUg31/mpwRMQyce+Nc VNycQjuFTyPZwVKjpxbDRDUwN2J1xS2nq9sNRDfk/3HOxK7KDt2xKhb0K8zrE2vuYZMn M0WDdyR9BCCdS8S3VaMuDf4el/wpNZmw+L9Ul1AKJ/GJLK4GC6EPAcW0v8+4IKC5yiHI fhbw== X-Gm-Message-State: AD7BkJIvqukzBrJRXgoeiSCtg9J5aBUBv4EVmi8NgQwHPv+VE4ETrdEicl4Da/Q4mirJBVCr X-Received: by 10.107.41.133 with SMTP id p127mr3900501iop.100.1458135957169; Wed, 16 Mar 2016 06:45:57 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id f129sm1648935ioe.36.2016.03.16.06.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 06:45:54 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 01B8A221BA9; Wed, 16 Mar 2016 07:45:51 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 16 Mar 2016 07:45:41 -0600 Message-Id: <1458135945-13385-12-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1458135945-13385-1-git-send-email-sjg@chromium.org> References: <1458135945-13385-1-git-send-email-sjg@chromium.org> Cc: Joe Hershberger , Tom Rini Subject: [U-Boot] [PATCH 11/14] mkimage: Fix missing free() and close() in fit_build() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Make sure that both the error path and normal return free the buffer and close the file. Reported-by: Coverity (CID: 138491) Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- tools/fit_image.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index e628212..9d553d1 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -329,7 +329,7 @@ static int fit_build(struct image_tool_params *params, const char *fname) if (ret < 0) { fprintf(stderr, "%s: Failed to build FIT image\n", params->cmdname); - goto err; + goto err_buf; } size = ret; fd = open(fname, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0666); @@ -346,9 +346,12 @@ static int fit_build(struct image_tool_params *params, const char *fname) goto err; } close(fd); + free(buf); return 0; err: + close(fd); +err_buf: free(buf); return -1; }