From patchwork Sun Dec 17 15:43:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 849641 X-Patchwork-Delegate: agraf@suse.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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z07s83RQMz9sR8 for ; Mon, 18 Dec 2017 02:49:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1BC87C21F3E; Sun, 17 Dec 2017 15:46:28 +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 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 4DC9EC21F99; Sun, 17 Dec 2017 15:45:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C387FC21F9B; Sun, 17 Dec 2017 15:45:16 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lists.denx.de (Postfix) with ESMTPS id CF794C21FE6 for ; Sun, 17 Dec 2017 15:45:11 +0000 (UTC) Received: from workstation4.fritz.box ([94.114.42.150]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MYfJW-1eUXIa2Xre-00VTRd; Sun, 17 Dec 2017 16:45:10 +0100 From: Heinrich Schuchardt To: Alexander Graf Date: Sun, 17 Dec 2017 16:43:32 +0100 Message-Id: <20171217154342.15469-7-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171217154342.15469-1-xypron.glpk@gmx.de> References: <20171217154342.15469-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:DNEC8RYeVbuYVj9yHgyiJ2n1w05gc9IrO1vGlP0s0BVZJHnv+2l KwbYRe0s6OcK4GTtmlq+A92Ahsv6md4brxgZHrQ2LrLKhzAojWG9/lwp5zS2hVYwLb1DwJ3 q/wDoYrQcAAboYRg4IroMP2zTGK1bzveGgQjCsMfwR7RRo6hRjYYKYG17l0uLgs3GQU5hfZ TmhZKddeLXJFn/IhTluzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:qNmx0l0OUpo=:mE+3rRR16/z0sB6T5mrzaB cf4fY3607Nb6KP0y5ZJ75UpS+81fnn3lnlM+GtR6B4WKP8gsAGGKFwaebszrUM+1KGgcnpUHl /lL06aC8CEWZSwlVLGP88rCnyRnFwZKYnz/2ISJQnIGZoRlh8Pm/wCJCwz3SpcO0T82lKsk4E RTMHQ/Z9THcggU5YoMR3CA/EQYqBB5xY11csK1AOGKMLUBqttwAihJ+w9erXfSpJFacAaRXIs 4dVX45NXG5yoz+BZRPWISHuwujmtnkYInNOLmhBaKIKq0ALzr3O0mmG6ky0w6Kdq9latLKHFG t4e0qTYCHZb8wkqo6rECmilNk8yHKYwF8LPW6C4cPno8j0mMqpAbfxwpffwA6/DzdkGvI823W 1UDkiXRQylD+W+ScVhOfKgYTLVcSqjb80/jPSIIXyhcBwHbem/7M9AmlPSfgYkKJLrp8UW2vX E+Yiarx3zkhFDc6z+qZ8ivaxZZFP8Xy60SILPcE/8BFs3Dirjqz6XBb0QSRhLt8U3MhanhLr5 w+VrDwRvzZu66BTZiMOLkzp3vyDFc7/pFMmlMfiFNGvgbZzLbAkOqPvuirXxoZMuElyt+q2U0 ACU9H9Kp/k7pkSImobCw2UgGmbCgpiHM+GOpHgP0VXdDLq80rCpQrjRtym5egY+f6J5YnlDMb 80SQ//kW8P/7zBjFgcMTqCxcKTN3/sll4cvkvN4eGAnLMGAVojh3Rx0pPqNZFY8Kmr3klBKFt gZ8D5hRzjKmPicq8CFoml2KQDbk66WZqIU4P2d9z13SHKeoWznL7GD6pcf9d/1cWD6dIArB9X JfsWU/WVcn7Axz+WCcbyWUmEDeOJA== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 06/16] efi_loader: open_info in CloseProtocol 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" efi_open_protocol and efi_close_protocol have to keep track of opened protocols. Check if the protocol was opened for the same agent and controller. Remove all open protocol information for this pair. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- lib/efi_loader/efi_boottime.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index bb80c6066a..a527e33141 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1675,9 +1675,33 @@ static efi_status_t EFIAPI efi_close_protocol(void *handle, void *agent_handle, void *controller_handle) { + struct efi_handler *handler; + struct efi_open_protocol_info_item *item; + struct efi_open_protocol_info_item *pos; + efi_status_t r; + EFI_ENTRY("%p, %pUl, %p, %p", handle, protocol, agent_handle, controller_handle); - return EFI_EXIT(EFI_NOT_FOUND); + + if (!agent_handle) { + r = EFI_INVALID_PARAMETER; + goto out; + } + r = efi_search_protocol(handle, protocol, &handler); + if (r != EFI_SUCCESS) + goto out; + + r = EFI_NOT_FOUND; + list_for_each_entry_safe(item, pos, &handler->open_infos, link) { + if (item->info.agent_handle == agent_handle && + item->info.controller_handle == controller_handle) { + efi_delete_open_info(item); + r = EFI_SUCCESS; + break; + } + } +out: + return EFI_EXIT(r); } /*