From patchwork Tue Jun 11 19:43:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1114204 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="EuYYTHiB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45NgSq5vRqz9s1c for ; Wed, 12 Jun 2019 05:44:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7F64DC22187; Tue, 11 Jun 2019 19:44:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9D453C21DD9; Tue, 11 Jun 2019 19:44:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 03E31C22115; Tue, 11 Jun 2019 19:44:14 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lists.denx.de (Postfix) with ESMTPS id 5F89DC22186 for ; Tue, 11 Jun 2019 19:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1560282250; bh=6AfyH11v3Y7NmwHVKG5BBxm4ANM2d50vaB3UQ4n59xs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EuYYTHiBInJWCAmT0VuYAhwEhMQ6EmXF/VW//mZQQAHTH8ffwQoEHscK9u+bMCCGC zjnEFhanpJsm/SvubENUd2moQOW1kKBFfYCg09/X1Klp6syz9v2vAeNryhXBp7ZMt+ QGVvdDyuWaBu+LSCyaZ0LbfVnwKiH7zsEoGO4SqU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.118.159.3]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MH5Sw-1hoaTY1F8E-00DpNX; Tue, 11 Jun 2019 21:44:10 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Tue, 11 Jun 2019 21:43:30 +0200 Message-Id: <20190611194330.8724-5-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190611194330.8724-1-xypron.glpk@gmx.de> References: <20190611194330.8724-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Xn0+Ibb7tT3AFglXSI5y5H2CZH+y2v01vzB5MKY3hJ0d3FKKN2N bzkuKGlfwR8L7aRYQvApvwT9CZGGxFAFSohA2AKLVxVKtRu7Bn9g6b8OKosIjvi9iXBWCVz dJCGcRBrYaChK7vBrZ6+hWmknLMbTaVLUiOz7xQ/NTn4GKNKFW0FWVIth/JPLIBUwniPsBb nFrFEphtLOAkdw9vsB6KA== X-UI-Out-Filterresults: notjunk:1; V03:K0:BXHhiLACjaY=:sUBpv1vErnAkwQYsicNnMs WIRtjWsP7p/kzkrmBH3dPl2E/UixserwHo30FqGUG33gcl2IlqPHpunhWSexcu1jUaaH8Jee9 A9f9zOd0r3gRUgiAm3jxXfC/dEPAHurf9zO7SaX83FRGf8Is4GMEyJO1wSHaK3yUhuptbLFEl kuPl0iK4Eddm1sU2pnIv/KS0mQyS8ASk0T1L8iO7QUt4cd2ZyA6+VWwLcRIk8YU4baK9dScKv TmnJ85zWePQtAQHw6GKf7OwtaLlfn0hEDoq9gJr7o7acG1+R07rSJePMphum5IOJlYz/qXH8w DDNO2alcvVDabWhwkO7romcRH+Xltl3Wyw+XyNXooU3xsiqOBk8VJJPYA44D9SxNUZrl9hjr9 1q66WkveToU31KAA7OZZ2EACN5ODNlbNOQG3CaGhu9el7w1RY1RJFnHgL3Mmtfqs3BveZPjQA nOV7uzouz4UcbonlnqZJ2vxgyqtulco+bK7BFuvA2+zQMFOae0iQs3+rIAsPoVGg5Xk+VlEKC rMfuAMgN5XVqsiCFgiHzQ1N39XoBCDmf3BM2kqb76EGKLGCNJNAlIymp+e5TNdgmmmOKS+eqd HZcZeMkAE7GNJdCWjl/tpubRi6Q8uyJ36LjsB/XBJ/zfG5ztXmrhAqxtEk8zhr05s4DK+hVQa egDu83zziEcP0Vg4cjzRZRpVSePNvOBUMNDAcTgtFvXBNln0l8ONmVSHjVglWcKGyiVRaeo15 3ocKmSpoyM7RxHXVTSvTGjg2gvM8RCmUQY6YtnyMEVYHtMRi4ikT+Nej1yomKF+3wtmyflWk8 6YFYbyHAtJghcDvvlQ2wkM5P8CmXXPrdzSS+p60zGA5p/S0z3Wqekk3vuEUr6+xp69pmdw3Ko YEWvU9zPGGmKkgnKkcRtCeRw3CldrU3av/5XTmlbtPLTWwSZvAWQGZUXQEke5y/I3hjf0tDdk CQX33SUDJ35IE1WdVv7eesLNKjAW64r21Bb0Ibr6YB6zsNglv7GlT Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 4/4] efi_loader: correct ExitBootServices() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Always use EFI_EXIT() to return from the function. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_boottime.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 275850a1a8..b26291b919 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1933,16 +1933,19 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, efi_uintn_t map_key) { struct efi_event *evt; + efi_status_t ret = EFI_SUCCESS; EFI_ENTRY("%p, %zx", image_handle, map_key); /* Check that the caller has read the current memory map */ - if (map_key != efi_memory_map_key) - return EFI_INVALID_PARAMETER; + if (map_key != efi_memory_map_key) { + ret = EFI_INVALID_PARAMETER; + goto out; + } /* Check if ExitBootServices has already been called */ if (!systab.boottime) - return EFI_EXIT(EFI_SUCCESS); + goto out; /* Stop all timer related activities */ timers_enabled = false; @@ -1990,8 +1993,8 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, /* Give the payload some time to boot */ efi_set_watchdog(0); WATCHDOG_RESET(); - - return EFI_EXIT(EFI_SUCCESS); +out: + return EFI_EXIT(ret); } /**