From patchwork Tue Jun 7 08:10:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1639841 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=Vz8OhkU0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHNP649HVz9sFs for ; Tue, 7 Jun 2022 18:11:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E3ADB842E0; Tue, 7 Jun 2022 10:10:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="Vz8OhkU0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CF61842C2; Tue, 7 Jun 2022 10:10:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 01E8E842C2 for ; Tue, 7 Jun 2022 10:10:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x52d.google.com with SMTP id w27so21867240edl.7 for ; Tue, 07 Jun 2022 01:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JZUwFnmidULUk7vTHm2uGLluDa5BlIhW14O1m7AbnHc=; b=Vz8OhkU0d/JGmyLnbH3dkwr1vCLTdMdk3d0X7mW2HXpmZEhU1A+Mpe1v2OVAOzGxQJ mEIqzK/fqxTjU0Bpl8ia4RVSSsj9u2QvSor4qEOLV+EdoZaqRVHmFWg+0MAi/qxCO8Da gztJ1vq9OKLnsm4fjrmSTj4f0ej91rAsQCMYUyK+GfJY4V0Kn7ctv0qqmtZ0M43wSpHo u5uNYMwXcEB18tUToqMAROZnLsRf/IEznUTwsmLe5m+tp8zKsxGtlP7P1aN0101U0FDu oDx0PVyJfiZ5TsNyIyyWvXBtNFAlSsCm5sdS8m+h+GQraX/LPe2QIp0gOWjovWJtMYiN KhNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JZUwFnmidULUk7vTHm2uGLluDa5BlIhW14O1m7AbnHc=; b=rSzoJSOIoxXVWthcNU97I4vgFuG4LEXzXhaDv/gofVdaxKkQgHWTq+xOaAEmrfWKbP RIcfzktbnng7riiZZsd74IT0Z+ADVM9a9dCc71Q/6DWCavb0AOrW1etTq3rCxpFmDvlT Jh+vmBTK/CstSqpGbxWYDgyPxCoTD88aBVUrNCQcGOqElpKvksEJVLGrTeeU6+STXfje uXO+ZpkIkKLBMT8zzticB9/UIUdo2jdUtZTs6vlCM5PmIBDsuw1pQhmf0mxLSxI86nJl In1pGTuh0qqmEFwzGYbU2Om7S1FfTRI5ctcfrLl1AQbW69rzOMfObB0MC6tmm+Odt1p1 Ii3A== X-Gm-Message-State: AOAM531Tq+1kUqmiBAz7GJ0bLU7VXdGWC8F4soFZgn/LmedipIZhKGPF /Ky94fvqWjuf22twHDhp0/bgY2+4zzGYCA== X-Google-Smtp-Source: ABdhPJwUQzlF/2V95zTWzVjBt4/ztPIXbFd2QWnF69JOi2z0Fz023RAl8sdFQsFcrmKhuvN0ncJmxA== X-Received: by 2002:a05:6402:528a:b0:42d:e116:fab8 with SMTP id en10-20020a056402528a00b0042de116fab8mr31140502edb.134.1654589447313; Tue, 07 Jun 2022 01:10:47 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id bs13-20020a056402304d00b0042bd6f745fasm9807995edb.92.2022.06.07.01.10.46 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 01:10:46 -0700 (PDT) From: Michal Simek X-Google-Original-From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Alistair Delva Subject: [PATCH v2 01/23] tools: relocate-rela: Open binary u-boot file later Date: Tue, 7 Jun 2022 10:10:18 +0200 Message-Id: <493b4309a6124bc3c36954153131d95cde75431b.1654589430.git.michal.simek@amd.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean There is no value to open u-boot binary file so early. Better to check all values first and then open binary file. Signed-off-by: Michal Simek --- (no changes since v1) tools/relocate-rela.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c index f0bc548617a4..883987111869 100644 --- a/tools/relocate-rela.c +++ b/tools/relocate-rela.c @@ -73,13 +73,6 @@ int main(int argc, char **argv) return 1; } - f = fopen(argv[1], "r+b"); - if (!f) { - fprintf(stderr, "%s: Cannot open %s: %s\n", - argv[0], argv[1], strerror(errno)); - return 2; - } - if (!read_num(argv[2], &text_base) || !read_num(argv[3], &rela_start) || !read_num(argv[4], &rela_end)) { @@ -95,6 +88,13 @@ int main(int argc, char **argv) rela_start -= text_base; rela_end -= text_base; + f = fopen(argv[1], "r+b"); + if (!f) { + fprintf(stderr, "%s: Cannot open %s: %s\n", + argv[0], argv[1], strerror(errno)); + return 2; + } + fseek(f, 0, SEEK_END); file_size = ftell(f); rewind(f);