Message ID | 20230515161707.460071056@linuxfoundation.org |
---|---|
State | Not Applicable |
Headers | show |
Series | None | expand |
Hi Greg, On Mon, May 15, 2023 at 6:39 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream. > > UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling > NO_IOMEM). 0bbadafdc49d is in v5.14. Was it backported to older versions? > > Current IMA build on UML fails on allmodconfig (with TCG_TPM=m): > > ld: security/integrity/ima/ima_queue.o: in function `ima_add_template_entry': > ima_queue.c:(.text+0x2d9): undefined reference to `tpm_pcr_extend' > ld: security/integrity/ima/ima_init.o: in function `ima_init': > ima_init.c:(.init.text+0x43f): undefined reference to `tpm_default_chip' > ld: security/integrity/ima/ima_crypto.o: in function `ima_calc_boot_aggregate_tfm': > ima_crypto.c:(.text+0x1044): undefined reference to `tpm_pcr_read' > ld: ima_crypto.c:(.text+0x10d8): undefined reference to `tpm_pcr_read' > > Modify the IMA Kconfig entry so that it selects TCG_TPM if HAS_IOMEM > is set, regardless of the UML Kconfig setting. > This updates TCG_TPM from =m to =y and fixes the linker errors. > > Fixes: f4a0391dfa91 ("ima: fix Kconfig dependencies") > Cc: Stable <stable@vger.kernel.org> # v5.14+ "v5.14+" > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Cc: Johannes Berg <johannes@sipsolutions.net> > Cc: linux-um@lists.infradead.org > Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > security/integrity/ima/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/security/integrity/ima/Kconfig > +++ b/security/integrity/ima/Kconfig > @@ -7,7 +7,7 @@ config IMA > select CRYPTO_HMAC > select CRYPTO_SHA1 > select CRYPTO_HASH_INFO > - select TCG_TPM if HAS_IOMEM && !UML > + select TCG_TPM if HAS_IOMEM > select TCG_TIS if TCG_TPM && X86 > select TCG_CRB if TCG_TPM && ACPI > select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES Gr{oetje,eeting}s, Geert
On Tue, May 16, 2023 at 10:47:13AM +0200, Geert Uytterhoeven wrote: > Hi Greg, > > On Mon, May 15, 2023 at 6:39 PM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: > > From: Randy Dunlap <rdunlap@infradead.org> > > > > commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream. > > > > UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling > > NO_IOMEM). > > 0bbadafdc49d is in v5.14. > Was it backported to older versions? Nope. > > Current IMA build on UML fails on allmodconfig (with TCG_TPM=m): > > > > ld: security/integrity/ima/ima_queue.o: in function `ima_add_template_entry': > > ima_queue.c:(.text+0x2d9): undefined reference to `tpm_pcr_extend' > > ld: security/integrity/ima/ima_init.o: in function `ima_init': > > ima_init.c:(.init.text+0x43f): undefined reference to `tpm_default_chip' > > ld: security/integrity/ima/ima_crypto.o: in function `ima_calc_boot_aggregate_tfm': > > ima_crypto.c:(.text+0x1044): undefined reference to `tpm_pcr_read' > > ld: ima_crypto.c:(.text+0x10d8): undefined reference to `tpm_pcr_read' > > > > Modify the IMA Kconfig entry so that it selects TCG_TPM if HAS_IOMEM > > is set, regardless of the UML Kconfig setting. > > This updates TCG_TPM from =m to =y and fixes the linker errors. > > > > Fixes: f4a0391dfa91 ("ima: fix Kconfig dependencies") This is what I triggered off of. > > Cc: Stable <stable@vger.kernel.org> # v5.14+ > > "v5.14+" Sorry, good catch, I'll go drop this from all of the older queues. thanks for the review! greg k-h
--- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -7,7 +7,7 @@ config IMA select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML + select TCG_TPM if HAS_IOMEM select TCG_TIS if TCG_TPM && X86 select TCG_CRB if TCG_TPM && ACPI select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES