From patchwork Thu Oct 6 13:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 612921 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp209708pvb; Thu, 6 Oct 2022 06:10:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4184enzPJr8xFxDs4AOuZF9NCm6/1eBCYHJtZkGH2jsCkEFE7chIlAaKAdzIbhsQQrnh9b X-Received: by 2002:a50:ec8f:0:b0:459:b0e0:e030 with SMTP id e15-20020a50ec8f000000b00459b0e0e030mr4637740edr.303.1665061817509; Thu, 06 Oct 2022 06:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665061817; cv=none; d=google.com; s=arc-20160816; b=PvHubU1GBYlUk6PfWdmhWMhperTl5AZwnEPEr1+xcJjcBkpwTn71wzxi0Zgp8Djimr CXxoKPQe8GuKfqvETS+zMIKCJrboKioCW4aKEITANvorxRJghh3XedA411OZ2OaK36hN z7uoy347X98l0B7lX8mD5ksS89w4zLpcW79lHjUirV7DtkR2L+E7KWoUnujwnzVLwYLc W/lStpZl+ZlVx8D8EBPdvK3DuM/JTSN69kCW+yvS4NgQ5lXPvgZvF8iP6zxf6sq/Luyo wTPRD2rCMhEzDrmCZWyeaysNkOFaz0jdNVqA8wir2EijY3tIyPYe26mszdGfg9lCNW8K qCVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PJFDeggFeQhrYvVIpORUmPTeZ8RXE1S6gtBx8ZhrqCo=; b=qO/Fp7QzOjZCjwU+m1/TzUxF4xelF0ZyJCmmqgnzeJXBC9sX02QrEBNqzT2txf9+bo NToftQnVGQe8x4Ll6Z6W9xYKszRtz8FSpd1iIloglbm4VE9+ZEnvOnZXxGJB5ByunLLA EwlBE4v62fmgCfcJgtTX+QjN07HgF9i+7o6y7rlMVmObe8GPYnlcMZr+IpqMedW4rgPW r3NnLGrQqGwZjF1JO/5NfAOdPBLu80pqy4jDzLLU5PinkM6fifNebLz6JOwjw266hIdl +WOUWWv7AeKBmRc/7y0+iexxBAscfEjQREWb2B64PDm5ioejPn8NywvUNJceOlEA1la8 kHvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gEo8kljI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id b4-20020a0564021f0400b00458b4bebee5si13278791edb.406.2022.10.06.06.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 06:10:17 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gEo8kljI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E2FD584DB6; Thu, 6 Oct 2022 15:09:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="gEo8kljI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D051584D93; Thu, 6 Oct 2022 15:09:28 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 451DC84D9C for ; Thu, 6 Oct 2022 15:09:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ej1-x62e.google.com with SMTP id a26so4477129ejc.4 for ; Thu, 06 Oct 2022 06:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=PJFDeggFeQhrYvVIpORUmPTeZ8RXE1S6gtBx8ZhrqCo=; b=gEo8kljIGqfraIT7GlZjvXdcbGqwc3EtRKNM4efwts/V59OleacVXZ5ZcJraJQd/Th pFJg2sTFX6mJn2TKfLn+sJ6rEPmBM4nwlbjFILmDgBWSX38lu/4+DW/0Ir9Ync/u4oTA VvvuoWs3ID2Zv+3gMXw0lSToq0qv2NtQr1U9Poq8XS6IhLd15qZum4ONjQun+0jZAiKm vW8UC2YEa7M0yCGZUIe6+z6HhlY+Y9XxjaUdiNLt7NN+VOG78SY1mMqORgMmHq8Lb1vE dbuVOhbl0X8vkKP4C7JRzGG576ZoiD+QN3/0jBRUu9aw9YqELDcI5fcAqp14MZ+QEznC tkfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=PJFDeggFeQhrYvVIpORUmPTeZ8RXE1S6gtBx8ZhrqCo=; b=58J/rDu3cMkxmOQjR7nSIc6q7k70HY3F+G02VolCNfQVC7/KtGr3h9UxQr4s95oAwb oGPfKwORCWvTQyMs5d2qF7fQz5iZe8H+JUUcPJiJRTXAV2Ogxk9D8JoI7VKVBnYOTStH NsuOc3j/67EoVuvAmwTcwK/z8m0xZfD4Rinc7K7MAw+y8e+aVHD3t1yrHJeL+Zogckha eew8KXfQsbYoEd8Y1BXP0MC8L7IDZadSfQCgRpEwDCt9ykEeG1pTxkbSj/Ip2J5q/AzS 6Mc6uQ3TVQP7o8N9uXJVrVDi/aLesXUnSrR905PWsRQZ1np7jC1LLI95SD6ESvhbKHyU X9eg== X-Gm-Message-State: ACrzQf1YmfhTIU2TDLt1vY0y5cKd0RUowK5dbtj+ilePwCRypHFpVlEk 3OruTDFMPkPlHYZ2f1Y0Sw8FFbKKV+RfOA== X-Received: by 2002:a17:907:9493:b0:78d:765:6cc9 with SMTP id dm19-20020a170907949300b0078d07656cc9mr3990767ejc.265.1665061739807; Thu, 06 Oct 2022 06:08:59 -0700 (PDT) Received: from hades.. (ppp046103015185.access.hol.gr. [46.103.15.185]) by smtp.gmail.com with ESMTPSA id e7-20020a056402104700b00459f4974128sm807211edu.50.2022.10.06.06.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 06:08:59 -0700 (PDT) From: Ilias Apalodimas To: xypron.glpk@gmx.de Cc: takahiro.akashi@linaro.org, Ilias Apalodimas , u-boot@lists.denx.de Subject: [PATCH 2/2] cmd: replace efi_create_handle/add_protocol with InstallMultipleProtocol Date: Thu, 6 Oct 2022 16:08:44 +0300 Message-Id: <20221006130847.22861-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221006130847.22861-1-ilias.apalodimas@linaro.org> References: <20221006130847.22861-1-ilias.apalodimas@linaro.org> 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.6 at phobos.denx.de X-Virus-Status: Clean In general handles should only be deleted if the last remaining protocol is removed. Instead of explicitly calling efi_create_handle -> efi_add_protocol -> efi_delete_handle which blindly removes all protocols from a handle before removing it, use InstallMultiple/UninstallMultiple which adheres to the EFI spec and only deletes a handle if there are no additional protocols present Signed-off-by: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- cmd/bootefi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 3041873afbbc..b93c0d3d4c02 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -492,7 +492,7 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) efi_handle_t mem_handle = NULL, handle; struct efi_device_path *file_path = NULL; struct efi_device_path *msg_path; - efi_status_t ret; + efi_status_t ret, ret2; u16 *load_options; if (!bootefi_device_path || !bootefi_image_path) { @@ -509,12 +509,9 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) * Make sure that device for device_path exist * in load_image(). Otherwise, shell and grub will fail. */ - ret = efi_create_handle(&mem_handle); - if (ret != EFI_SUCCESS) - goto out; - - ret = efi_add_protocol(mem_handle, &efi_guid_device_path, - file_path); + ret = efi_install_multiple_protocol_interfaces(&mem_handle, + &efi_guid_device_path, + file_path, NULL); if (ret != EFI_SUCCESS) goto out; msg_path = file_path; @@ -542,9 +539,11 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size) ret = do_bootefi_exec(handle, load_options); out: - efi_delete_handle(mem_handle); + ret2 = efi_uninstall_multiple_protocol_interfaces(mem_handle, + &efi_guid_device_path, + file_path, NULL); efi_free_pool(file_path); - return ret; + return (ret != EFI_SUCCESS) ? ret : ret2; } #ifdef CONFIG_CMD_BOOTEFI_SELFTEST