2020-02-15 01:49:55

by Tushar Sugandhi

Subject: [PATCH v4 1/3] IMA: Update KBUILD_MODNAME for IMA files to ima

The kbuild Makefile specifies object files for vmlinux in the $(obj-y)
lists. These lists depend on the kernel configuration[1].

The kbuild Makefile for IMA combines the object files for IMA into a
single object file namely ima.o. All the object files for IMA should be
combined into ima.o. But certain object files are being added to their
own $(obj-y). This results in the log messages from those modules getting
prefixed with their respective base file name, instead of "ima". This is
inconsistent with the log messages from the IMA modules that are combined
into ima.o.

This change fixes the above issue.

[1] Documentation\kbuild\makefiles.rst

Signed-off-by: Tushar Sugandhi <[email protected]>
Reviewed-by: Lakshmi Ramasubramanian <[email protected]>
---
security/integrity/ima/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/integrity/ima/Makefile b/security/integrity/ima/Makefile
index 064a256f8725..67dabca670e2 100644
--- a/security/integrity/ima/Makefile
+++ b/security/integrity/ima/Makefile
@@ -11,6 +11,6 @@ ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \
ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o
ima-$(CONFIG_IMA_APPRAISE_MODSIG) += ima_modsig.o
ima-$(CONFIG_HAVE_IMA_KEXEC) += ima_kexec.o
-obj-$(CONFIG_IMA_BLACKLIST_KEYRING) += ima_mok.o
-obj-$(CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS) += ima_asymmetric_keys.o
-obj-$(CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS) += ima_queue_keys.o
+ima-$(CONFIG_IMA_BLACKLIST_KEYRING) += ima_mok.o
+ima-$(CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS) += ima_asymmetric_keys.o
+ima-$(CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS) += ima_queue_keys.o
--
2.17.1

2020-02-18 19:28:03

by Tushar Sugandhi

Subject: Re: [PATCH v4 1/3] IMA: Update KBUILD_MODNAME for IMA files to ima

Hi Mimi,

On 2020-02-14 5:47 p.m., Tushar Sugandhi wrote:
> The kbuild Makefile specifies object files for vmlinux in the $(obj-y)
> lists. These lists depend on the kernel configuration[1].
>
> The kbuild Makefile for IMA combines the object files for IMA into a
> single object file namely ima.o. All the object files for IMA should be
> combined into ima.o. But certain object files are being added to their
> own $(obj-y). This results in the log messages from those modules getting
> prefixed with their respective base file name, instead of "ima". This is
> inconsistent with the log messages from the IMA modules that are combined
> into ima.o.
>
> This change fixes the above issue.
>
> [1] Documentation\kbuild\makefiles.rst
>
Is there any feedback on this patch description?
I can address it in the next iteration.

Thanks,
Tushar

2020-02-18 19:38:40

by Mimi Zohar

Subject: Re: [PATCH v4 1/3] IMA: Update KBUILD_MODNAME for IMA files to ima

On Tue, 2020-02-18 at 11:25 -0800, Tushar Sugandhi wrote:
> Hi Mimi,
>
> On 2020-02-14 5:47 p.m., Tushar Sugandhi wrote:
> > The kbuild Makefile specifies object files for vmlinux in the $(obj-y)
> > lists. These lists depend on the kernel configuration[1].
> >
> > The kbuild Makefile for IMA combines the object files for IMA into a
> > single object file namely ima.o. All the object files for IMA should be
> > combined into ima.o. But certain object files are being added to their
> > own $(obj-y). This results in the log messages from those modules getting
> > prefixed with their respective base file name, instead of "ima". This is
> > inconsistent with the log messages from the IMA modules that are combined
> > into ima.o.
> >
> > This change fixes the above issue.
> >
> > [1] Documentation\kbuild\makefiles.rst
> >
> Is there any feedback on this patch description?
> I can address it in the next iteration.

No, it looks good to me.

Mimi