From patchwork Fri Jul 17 08:19:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1330919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=odhudVpe; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7PGY1l7nz9sRf for ; Fri, 17 Jul 2020 18:21:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=I9XDulrFFVZI3c8HWjoXH0C09gSLxRuPF3MtyRSXo1c=; b=odhudVpevDsfZSvviyrO+isZq2 OqZXDqCNN1b6k+vx2O10Gr5FeqH1rwj7D8CVwGRn2kQbVyBtOxdAqAOYNoalIqvltIKc+aHMRuuR2 Uu6YAnLZm90ly4JpxqTRC8F1jbM8ZVSjC8SbbyB7dJ11//ANNKFMdWRpDToLZYlmiHrI+v4IAaMKh t9Dm00awLRB/50uqbesXwgmR32zUZaCjganDweOW44XuEC3EFxHdxG8t1uGx7mlgZnMzas1GdXEs0 did1pCiaSQwe1Kg4L6S/mYegsBJ0Iwaan6Sq+Ou+K7bzRchKUN4TlgePmDlUi/QbgJ2EsBaXnAhya BVfc5n9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwLbC-0003pz-1j; Fri, 17 Jul 2020 08:20:06 +0000 Received: from relay5-d.mail.gandi.net ([217.70.183.197]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwLb2-0003mF-Gj for openwrt-devel@lists.openwrt.org; Fri, 17 Jul 2020 08:20:00 +0000 X-Originating-IP: 72.234.141.215 Received: from dawn.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPA id B81111C000D; Fri, 17 Jul 2020 08:19:52 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 1/2] scripts: mkhash fix return code handling Date: Thu, 16 Jul 2020 22:19:31 -1000 Message-Id: <20200717081932.3745194-1-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200717_041956_730162_6C7E0A14 X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.197 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.70.183.197 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org If hashing a file fails mkhash shouldn't just silently fail. Now check after each call of `hash_file()` the return and exit early in case of errors. The return value which was previously ignored and would always return 0. Signed-off-by: Paul Spooren --- scripts/mkhash.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/mkhash.c b/scripts/mkhash.c index e26ca3a350..ea3bd60ce1 100644 --- a/scripts/mkhash.c +++ b/scripts/mkhash.c @@ -823,8 +823,11 @@ int main(int argc, char **argv) if (argc < 2) return hash_file(t, NULL, add_filename); - for (i = 0; i < argc - 1; i++) - hash_file(t, argv[1 + i], add_filename); + for (i = 0; i < argc - 1; i++) { + int ret = hash_file(t, argv[1 + i], add_filename); + if (ret) + return ret; + } return 0; }