From patchwork Thu Nov 5 16:03:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Bedel X-Patchwork-Id: 540497 X-Patchwork-Delegate: swarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C76F140E1A for ; Fri, 6 Nov 2015 03:03:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756387AbbKEQDf (ORCPT ); Thu, 5 Nov 2015 11:03:35 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:64114 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1033530AbbKEQDd (ORCPT ); Thu, 5 Nov 2015 11:03:33 -0500 Received: from mailbox.adnet.avionic-design.de ([109.75.18.3]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0Lzrl5-1aX9zV3mDb-0155gw for ; Thu, 05 Nov 2015 17:03:30 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 140082A28180; Thu, 5 Nov 2015 17:03:30 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m6kQ+sPH98Gr; Thu, 5 Nov 2015 17:03:28 +0100 (CET) Received: from avionic-0020.adnet.avionic-design.de (avionic-0020.adnet.avionic-design.de [172.20.31.243]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id D5EAF2A28044; Thu, 5 Nov 2015 17:03:28 +0100 (CET) From: Alban Bedel To: linux-tegra@vger.kernel.org Cc: Alban Bedel Subject: [cbootimage PATCH 1/3] Fix the error reporting of get_bct_size_from_image() Date: Thu, 5 Nov 2015 17:03:20 +0100 Message-Id: <1446739402-14238-2-git-send-email-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1446739402-14238-1-git-send-email-alban.bedel@avionic-design.de> References: <1446739402-14238-1-git-send-email-alban.bedel@avionic-design.de> X-Provags-ID: V03:K0:qiuO/vgijx+SASbmM3LQuIouQPqZCE0bB5vEa0kMYM6YBw+qx4a zsJOW2y8/BXdNOhyq039EweuPQ17p0NnHgrqP2Yr7X4FJWWJs9umR7I36Rt6EExuBtRjvY2 BW0B/deMvP+x5fixN37FBTcy9R1zz7xp4jB3Hj5xrsqm421yPvDt10a2ZYlUoxOnY6SOzTM rcCmiPVFrjUdOuQDbs6fQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:V/xUj74TCLg=:7/lkDCbumbEpkvU/EpUp77 iWN8fhZDlvrVaVtHf5OP2A/0xFQoXl090gDpoZO1zu3Bz8e5AUP7Qw05WwAxUHPMy9gEThR/F H5b2lO1C/cFQ+CWl8w6OAQIRr+FUiy5ef1vRxDGnhwPXF5Het4yU68cbUljR8Rl3y7cJaqany iBcIS4ZyetoA4HQZhi1gpQWGkoO7iKq4TL/cCalOrjLn63Xbn/XZXzKHmETnXAr8KForKsQ2R C+F6bzVT2qgV/+tuinsTzAiEdRAxjjEhXdXWDdEcvKkH8mxt+Nkc4zsy+lqxufAQMiNheZbe+ a9DB2EjDG4mJZlflyKS2QYMejbjEbvMNuBEG/0QLd/dlHUDEIlBJpJ/Je6LFS2viWeYQTJ/q/ nTnw5/7c4IoGEo/t5zewtlAVW+1akwAstTkmQKMZHFzUE5r4Gt8NqjcDScfou/xU1reiEFU5W Rr+tvizjGQ8RreQdU6TJJXfEGmMPWq215jRYNZ/OvShAmAIp/sFFPBIvTimeAVQod7qmt7OP0 if8weaZuruQ+ZXwBDaxHpzu8mvBRarCbyeqhfPIoh9h1+KnS9L2Q4j7p8Hoa7yifLE6Hz/srg fPoVRcUjwUkmXJhrjFzqG3ncHmkUXrmIMEFxA27KB0kYdyOPhj0UL9gtwJqKD17JHbhb0Jjsb OimT1f7lFNisvXdo8XGUx0KDl+dOIrWZSODb6HlXS/k1KvYX+lb2lRPU9CDcrdtJZYag= Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org get_bct_size_from_image() should return negative error codes, so add the missing minus signs. Also fix the return value check on get_bct_size_from_image(), a negative value indicate an error not zero. Signed-off-by: Alban Bedel --- src/cbootimage.c | 2 +- src/data_layout.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cbootimage.c b/src/cbootimage.c index da1d1a5..fc99af2 100644 --- a/src/cbootimage.c +++ b/src/cbootimage.c @@ -239,7 +239,7 @@ main(int argc, char *argv[]) /* Get BCT_SIZE from input image file */ bct_size = get_bct_size_from_image(&context); - if (!bct_size) { + if (bct_size < 0) { printf("Error: Invalid input image file %s\n", context.input_image_filename); goto fail; diff --git a/src/data_layout.c b/src/data_layout.c index 5d3fe10..e91d13c 100644 --- a/src/data_layout.c +++ b/src/data_layout.c @@ -1050,11 +1050,11 @@ int get_bct_size_from_image(build_image_context *context) fp = fopen(context->input_image_filename, "r"); if (!fp) - return ENODATA; + return -ENODATA; if (fread(buffer, 1, NVBOOT_CONFIG_TABLE_SIZE_MAX, fp) != NVBOOT_CONFIG_TABLE_SIZE_MAX) { fclose(fp); - return ENODATA; + return -ENODATA; } context->bct = buffer;