From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA128C4361B for ; Mon, 7 Dec 2020 01:55:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79BC022ADF for ; Mon, 7 Dec 2020 01:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728698AbgLGBzC (ORCPT ); Sun, 6 Dec 2020 20:55:02 -0500 Received: from linux.microsoft.com ([13.77.154.182]:49860 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727375AbgLGBzC (ORCPT ); Sun, 6 Dec 2020 20:55:02 -0500 Received: from [192.168.0.104] (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id D9FE020B717A; Sun, 6 Dec 2020 17:54:20 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D9FE020B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1607306061; bh=NbjjcIDpX6Nk+8/PwvfcUo46PuXJ3kESKsFB80ONKsk=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=SiAQjDSJXURaDi/C09ZE7cXX1qRI5ww1Kl7E1x2YQ3BPeaX/j6XsUQbd9R8Oe0G+3 V66h24g35lAxbiPR1Nyx++IWNswYJadHJpUplckwSdnZ+1TFqZHWCKUxuKkfQcC+/G n4HBHecggMVcU6SIR5gmKvWC9ax2VGnLS0QctSF4= Subject: Re: [PATCH v10 4/8] powerpc: Use ima kexec node functions To: Thiago Jung Bauermann Cc: zohar@linux.ibm.com, robh@kernel.org, gregkh@linuxfoundation.org, james.morse@arm.com, catalin.marinas@arm.com, sashal@kernel.org, will@kernel.org, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, robh+dt@kernel.org, frowand.list@gmail.com, vincenzo.frascino@arm.com, mark.rutland@arm.com, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com, pasha.tatashin@soleen.com, allison@lohutok.net, kstewart@linuxfoundation.org, takahiro.akashi@linaro.org, tglx@linutronix.de, masahiroy@kernel.org, bhsharma@redhat.com, mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com, christophe.leroy@c-s.fr, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, prsriva@linux.microsoft.com, balajib@linux.microsoft.com References: <20201204195149.611-1-nramas@linux.microsoft.com> <20201204195149.611-5-nramas@linux.microsoft.com> <87v9dgm3p9.fsf@manicouagan.localdomain> From: Lakshmi Ramasubramanian Message-ID: <28685cf7-be32-b023-071d-fbe964b27567@linux.microsoft.com> Date: Sun, 6 Dec 2020 17:54:20 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <87v9dgm3p9.fsf@manicouagan.localdomain> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/5/20 11:51 AM, Thiago Jung Bauermann wrote: > > Lakshmi Ramasubramanian writes: > >> do_get_kexec_buffer() and get_addr_size_cells() are called by >> ima_get_kexec_buffer(), ima_free_kexec_buffer, and remove_ima_buffer() >> to retrieve the address and size of the buffer used for carrying >> forward the IMA measurement log across kexec system call. These >> functions correctly handle a device tree property that is a child node >> of the root node, but not anything other than the immediate root >> child nodes. >> >> Use the architecture independent functions get_ima_kexec_buffer() >> and get_root_addr_size_cells() defined in "drivers/of/ima_kexec.c", > > s/ima_kexec.c/kexec.c/ Thanks for catching this. I'll fix it. > >> to get the address and size of the IMA measurement log buffer from >> the device tree. Remove do_get_kexec_buffer() and get_addr_size_cells() >> since they are not used anymore. >> >> Co-developed-by: Prakhar Srivastava >> Signed-off-by: Prakhar Srivastava >> Signed-off-by: Lakshmi Ramasubramanian > > Looks good. Thanks! > > Reviewed-by: Thiago Jung Bauermann Thanks Thiago. -lakshmi >> --- >> arch/powerpc/kexec/ima.c | 58 +++++----------------------------------- >> 1 file changed, 7 insertions(+), 51 deletions(-) >> >> diff --git a/arch/powerpc/kexec/ima.c b/arch/powerpc/kexec/ima.c >> index a36c39db4b1a..906e8212435d 100644 >> --- a/arch/powerpc/kexec/ima.c >> +++ b/arch/powerpc/kexec/ima.c >> @@ -13,40 +13,6 @@ >> #include >> #include >> >> -static int get_addr_size_cells(int *addr_cells, int *size_cells) >> -{ >> - struct device_node *root; >> - >> - root = of_find_node_by_path("/"); >> - if (!root) >> - return -EINVAL; >> - >> - *addr_cells = of_n_addr_cells(root); >> - *size_cells = of_n_size_cells(root); >> - >> - of_node_put(root); >> - >> - return 0; >> -} >> - >> -static int do_get_kexec_buffer(const void *prop, int len, unsigned long *addr, >> - size_t *size) >> -{ >> - int ret, addr_cells, size_cells; >> - >> - ret = get_addr_size_cells(&addr_cells, &size_cells); >> - if (ret) >> - return ret; >> - >> - if (len < 4 * (addr_cells + size_cells)) >> - return -ENOENT; >> - >> - *addr = of_read_number(prop, addr_cells); >> - *size = of_read_number(prop + 4 * addr_cells, size_cells); >> - >> - return 0; >> -} >> - >> /** >> * ima_get_kexec_buffer - get IMA buffer from the previous kernel >> * @addr: On successful return, set to point to the buffer contents. >> @@ -56,16 +22,11 @@ static int do_get_kexec_buffer(const void *prop, int len, unsigned long *addr, >> */ >> int ima_get_kexec_buffer(void **addr, size_t *size) >> { >> - int ret, len; >> + int ret; >> unsigned long tmp_addr; >> size_t tmp_size; >> - const void *prop; >> >> - prop = of_get_property(of_chosen, "linux,ima-kexec-buffer", &len); >> - if (!prop) >> - return -ENOENT; >> - >> - ret = do_get_kexec_buffer(prop, len, &tmp_addr, &tmp_size); >> + ret = get_ima_kexec_buffer(NULL, 0, &tmp_addr, &tmp_size); >> if (ret) >> return ret; >> >> @@ -89,7 +50,7 @@ int ima_free_kexec_buffer(void) >> if (!prop) >> return -ENOENT; >> >> - ret = do_get_kexec_buffer(prop->value, prop->length, &addr, &size); >> + ret = get_ima_kexec_buffer(NULL, 0, &addr, &size); >> if (ret) >> return ret; >> >> @@ -98,7 +59,6 @@ int ima_free_kexec_buffer(void) >> return ret; >> >> return memblock_free(addr, size); >> - >> } >> >> /** >> @@ -112,19 +72,15 @@ int ima_free_kexec_buffer(void) >> */ >> void remove_ima_buffer(void *fdt, int chosen_node) >> { >> - int ret, len; >> + int ret; >> unsigned long addr; >> size_t size; >> - const void *prop; >> >> - prop = fdt_getprop(fdt, chosen_node, "linux,ima-kexec-buffer", &len); >> - if (!prop) >> + ret = get_ima_kexec_buffer(fdt, chosen_node, &addr, &size); >> + if (ret) >> return; >> >> - ret = do_get_kexec_buffer(prop, len, &addr, &size); >> fdt_delprop(fdt, chosen_node, "linux,ima-kexec-buffer"); >> - if (ret) >> - return; >> >> ret = delete_fdt_mem_rsv(fdt, addr, size); >> if (!ret) >> @@ -191,7 +147,7 @@ int setup_ima_buffer(const struct kimage *image, void *fdt, int chosen_node) >> if (!image->arch.ima_buffer_size) >> return 0; >> >> - ret = get_addr_size_cells(&addr_cells, &size_cells); >> + ret = get_root_addr_size_cells(&addr_cells, &size_cells); >> if (ret) >> return ret; > >