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=-17.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 DD598C433DB for ; Wed, 23 Dec 2020 05:03:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A30B7223E0 for ; Wed, 23 Dec 2020 05:03:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A30B7223E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rJePx7bXV+Uubf18CnacrZcVgLXXvkrQbUF8HLUj/PM=; b=xJ1Jv01r1qojQP42LGwL0gUmm NJDQ+0X+ybWOnKRZuofV1o7yfMf4LM6Q+MVsqtfh52FQYDEThMBFFvMbi6VHLUbx3DfUL649oEaIX J2wSb4kRGueGjY9J7H7UQs78y2QamhTiBYH6zlhMX1wNaez1YK9jGjumKfylEeuM8JTLaRvaQNkUJ EMq9wqf/z5dlNOkTPy11Rz6BkeqHU04NeQ0W0yKdV3ZHLbG2CjbxyympIc5qAAwuU6ZRVBkr37A17 ys1eValkfueoxf8jU9D88icJ1WYOt+EqEpxusFPbMbRc8SwTzRPZNWLHxzSGI1GqYdkFLh+tec+mb MGaQ0qP5w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krwHe-0007aF-2T; Wed, 23 Dec 2020 05:01:58 +0000 Received: from linux.microsoft.com ([13.77.154.182]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krwHa-0007Zd-MB for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 05:01:55 +0000 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 08A6C20B7192; Tue, 22 Dec 2020 21:01:53 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 08A6C20B7192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1608699713; bh=jvhh/Z2/WSlyeBqb+UrNARECAlTWvMC3tRARFOQqgQk=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=dD8+/9CsGqR4mNrHeZSfZKjwbN22nfNq9P1nYds8tsd2JGh5KTdKuI5R2Nlo/jIh/ OfeRlveugjpKV1wIoEBxhhSSIDVC6iV18AABbDlj+rVC5enFFHGtRoUiH90ZzZyoiU 5htWpiqbVtinOGKHLmej7EBQqqW1FD/LHkQ20NeE= Subject: Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c To: Thiago Jung Bauermann References: <20201219175713.18888-1-nramas@linux.microsoft.com> <20201219175713.18888-3-nramas@linux.microsoft.com> <87blell6g2.fsf@manicouagan.localdomain> From: Lakshmi Ramasubramanian Message-ID: <6d7e0147-b5e4-d364-af7d-c089217e3fb0@linux.microsoft.com> Date: Tue, 22 Dec 2020 21:01:52 -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: <87blell6g2.fsf@manicouagan.localdomain> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_000154_906042_FA9C9606 X-CRM114-Status: GOOD ( 18.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, benh@kernel.crashing.org, bhsharma@redhat.com, tao.li@vivo.com, zohar@linux.ibm.com, paulus@samba.org, vincenzo.frascino@arm.com, frowand.list@gmail.com, sashal@kernel.org, mpe@ellerman.id.au, masahiroy@kernel.org, jmorris@namei.org, takahiro.akashi@linaro.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, serge@hallyn.com, devicetree@vger.kernel.org, pasha.tatashin@soleen.com, will@kernel.org, prsriva@linux.microsoft.com, hsinyi@chromium.org, allison@lohutok.net, christophe.leroy@c-s.fr, mbrugger@suse.com, balajib@linux.microsoft.com, dmitry.kasatkin@gmail.com, linux-kernel@vger.kernel.org, james.morse@arm.com, gregkh@linuxfoundation.org, linux-integrity@vger.kernel.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/22/20 4:19 PM, Thiago Jung Bauermann wrote: > > Lakshmi Ramasubramanian writes: > >> The functions defined in "arch/powerpc/kexec/ima.c" handle setting up >> and freeing the resources required to carry over the IMA measurement >> list from the current kernel to the next kernel across kexec system call. >> These functions do not have architecture specific code, but are >> currently limited to powerpc. >> >> Move setup_ima_buffer() call into of_kexec_setup_new_fdt() defined in >> "drivers/of/kexec.c". >> >> Move the remaining architecture independent functions from >> "arch/powerpc/kexec/ima.c" to "drivers/of/kexec.c". >> Delete "arch/powerpc/kexec/ima.c" and "arch/powerpc/include/asm/ima.h". >> Remove references to the deleted files in powerpc and in ima. >> >> Co-developed-by: Prakhar Srivastava >> Signed-off-by: Prakhar Srivastava >> Signed-off-by: Lakshmi Ramasubramanian >> --- >> arch/powerpc/include/asm/ima.h | 27 ---- >> arch/powerpc/kexec/Makefile | 7 - >> arch/powerpc/kexec/file_load.c | 7 - >> arch/powerpc/kexec/ima.c | 202 ------------------------- >> drivers/of/kexec.c | 235 +++++++++++++++++++++++++++++ >> include/linux/of.h | 2 + >> security/integrity/ima/ima.h | 4 - >> security/integrity/ima/ima_kexec.c | 1 + >> 8 files changed, 238 insertions(+), 247 deletions(-) >> delete mode 100644 arch/powerpc/include/asm/ima.h >> delete mode 100644 arch/powerpc/kexec/ima.c > > This looks good, provided the changes from the discussion with Mimi are > made. Also, minor nits below. I will address the changes Mimi had stated. > >> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h >> index 6ebefec616e4..7c3947ad3773 100644 >> --- a/security/integrity/ima/ima.h >> +++ b/security/integrity/ima/ima.h >> @@ -24,10 +24,6 @@ >> >> #include "../integrity.h" >> >> -#ifdef CONFIG_HAVE_IMA_KEXEC >> -#include >> -#endif >> - >> enum ima_show_type { IMA_SHOW_BINARY, IMA_SHOW_BINARY_NO_FIELD_LEN, >> IMA_SHOW_BINARY_OLD_STRING_FMT, IMA_SHOW_ASCII }; >> enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8, TPM_PCR10 = 10 }; > > This belongs in patch 1. No - the reference to "asm/ima.h" cannot be removed in Patch #1 since ima_get_kexec_buffer() and ima_free_kexec_buffer() are still declared in this header. They are moved in this patch only (Patch #2). >> diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c >> index 38bcd7543e27..8a6712981dee 100644 >> --- a/security/integrity/ima/ima_kexec.c >> +++ b/security/integrity/ima/ima_kexec.c >> @@ -10,6 +10,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include "ima.h" > > This include isn't necessary. This change is necessary because ima_get_kexec_buffer() and ima_free_kexec_buffer() are now declared in "linux/of.h". -lakshmi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel