linux-kernel - Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87r1ngv20u.fsf@manicouagan.localdomain>
Date:   Wed, 23 Dec 2020 14:57:21 -0300
From:   Thiago Jung Bauermann <bauerman@...ux.ibm.com>
To:     Lakshmi Ramasubramanian <nramas@...ux.microsoft.com>
Cc:     zohar@...ux.ibm.com, robh@...nel.org, takahiro.akashi@...aro.org,
        gregkh@...uxfoundation.org, will@...nel.org,
        catalin.marinas@....com, mpe@...erman.id.au, james.morse@....com,
        sashal@...nel.org, benh@...nel.crashing.org, paulus@...ba.org,
        frowand.list@...il.com, vincenzo.frascino@....com,
        mark.rutland@....com, dmitry.kasatkin@...il.com, jmorris@...ei.org,
        serge@...lyn.com, pasha.tatashin@...een.com, allison@...utok.net,
        masahiroy@...nel.org, bhsharma@...hat.com, mbrugger@...e.com,
        hsinyi@...omium.org, tao.li@...o.com, christophe.leroy@....fr,
        prsriva@...ux.microsoft.com, balajib@...ux.microsoft.com,
        linux-integrity@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org, devicetree@...r.kernel.org
Subject: Re: [PATCH v13 2/6] powerpc: Move arch independent ima kexec
 functions to drivers/of/kexec.c


Lakshmi Ramasubramanian <nramas@...ux.microsoft.com> writes:

> On 12/22/20 4:19 PM, Thiago Jung Bauermann wrote:
>> Lakshmi Ramasubramanian <nramas@...ux.microsoft.com> writes:
>> 
>>> 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 <asm/ima.h>
>>> -#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).

Indeed, you are right. My mistake.

>>> 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 <linux/seq_file.h>
>>>   #include <linux/vmalloc.h>
>>>   #include <linux/kexec.h>
>>> +#include <linux/of.h>
>>>   #include <linux/ima.h>
>>>   #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".

You are right here as well. Before I made the suggestion, I had tested
building the kernel without the include above and it worked fine, but
that's because <linux/of.h> is being included indirectly by some other
header file. It's better to include it explicitly.

-- 
Thiago Jung Bauermann
IBM Linux Technology Center