drop ima patch that is not needed

diff --git a/queue-4.14/ima-allow-fix-uml-builds.patch b/queue-4.14/ima-allow-fix-uml-builds.patch
deleted file mode 100644 (file)
index 675d2e9..0000000
--- a/queue-4.14/ima-allow-fix-uml-builds.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 644f17412f5acf01a19af9d04a921937a2bc86c6 Mon Sep 17 00:00:00 2001
-From: Randy Dunlap <rdunlap@infradead.org>
-Date: Thu, 23 Feb 2023 19:27:03 -0800
-Subject: IMA: allow/fix UML builds
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream.
-
-UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling
-NO_IOMEM).
-
-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+
-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
-@@ -8,7 +8,7 @@ config IMA
-       select CRYPTO_MD5
-       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

diff --git a/queue-4.14/series b/queue-4.14/series
index c27be92d02c405114b1c2c8c55b1f4a51ec343d6..4aaa1928596ec314f6cee00c0d42286fd997b1b3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -2,7 +2,6 @@ wifi-brcmfmac-slab-out-of-bounds-read-in-brcmf_get_assoc_ies.patch
 bluetooth-perform-careful-capability-checks-in-hci_sock_ioctl.patch
 usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch
 iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch
-ima-allow-fix-uml-builds.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-unbind.patch
 perf-sched-cast-pthread_stack_min-to-int-as-it-may-turn-into-sysconf-__sc_thread_stack_min_value.patch
 staging-iio-resolver-ads1210-fix-config-mode.patch

diff --git a/queue-4.19/ima-allow-fix-uml-builds.patch b/queue-4.19/ima-allow-fix-uml-builds.patch
deleted file mode 100644 (file)
index 4a704dc..0000000
--- a/queue-4.19/ima-allow-fix-uml-builds.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 644f17412f5acf01a19af9d04a921937a2bc86c6 Mon Sep 17 00:00:00 2001
-From: Randy Dunlap <rdunlap@infradead.org>
-Date: Thu, 23 Feb 2023 19:27:03 -0800
-Subject: IMA: allow/fix UML builds
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream.
-
-UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling
-NO_IOMEM).
-
-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+
-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

diff --git a/queue-4.19/series b/queue-4.19/series
index 620157a1cb88276ef271ae2a69b2f742284a53a9..3e3bfda7127ca79f5e85eb78914caedf8259cff6 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -4,7 +4,6 @@ usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch
 iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch
 asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch
 stmmac-debugfs-entry-name-is-not-be-changed-when-udev-rename-device-name.patch
-ima-allow-fix-uml-builds.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-unbind.patch
 perf-sched-cast-pthread_stack_min-to-int-as-it-may-turn-into-sysconf-__sc_thread_stack_min_value.patch
 staging-iio-resolver-ads1210-fix-config-mode.patch

diff --git a/queue-5.10/ima-allow-fix-uml-builds.patch b/queue-5.10/ima-allow-fix-uml-builds.patch
deleted file mode 100644 (file)
index b2c8eaf..0000000
--- a/queue-5.10/ima-allow-fix-uml-builds.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 644f17412f5acf01a19af9d04a921937a2bc86c6 Mon Sep 17 00:00:00 2001
-From: Randy Dunlap <rdunlap@infradead.org>
-Date: Thu, 23 Feb 2023 19:27:03 -0800
-Subject: IMA: allow/fix UML builds
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream.
-
-UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling
-NO_IOMEM).
-
-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+
-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
-@@ -8,7 +8,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

diff --git a/queue-5.10/series b/queue-5.10/series
index 2290ca69e8a181a121cd0191f2ab8889946585f4..959f3d6c52ca09c66008a26ad5daa2b095532385 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -14,7 +14,6 @@ asm-generic-io.h-suppress-endianness-warnings-for-re.patch
 wireguard-timers-cast-enum-limits-members-to-int-in-prints.patch
 pci-pciehp-fix-ab-ba-deadlock-between-reset_lock-and-device_lock.patch
 pci-qcom-fix-the-incorrect-register-usage-in-v2.7.0-config.patch
-ima-allow-fix-uml-builds.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-probe-errors.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-unbind.patch
 hwmon-k10temp-check-range-scale-when-cur_temp-register-is-read-write.patch

diff --git a/queue-5.4/ima-allow-fix-uml-builds.patch b/queue-5.4/ima-allow-fix-uml-builds.patch
deleted file mode 100644 (file)
index b2c8eaf..0000000
--- a/queue-5.4/ima-allow-fix-uml-builds.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 644f17412f5acf01a19af9d04a921937a2bc86c6 Mon Sep 17 00:00:00 2001
-From: Randy Dunlap <rdunlap@infradead.org>
-Date: Thu, 23 Feb 2023 19:27:03 -0800
-Subject: IMA: allow/fix UML builds
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream.
-
-UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling
-NO_IOMEM).
-
-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+
-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
-@@ -8,7 +8,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

diff --git a/queue-5.4/series b/queue-5.4/series
index 9f83fb0346bde41eeed858e9b31bf497e8f9091d..5facb6678f93eb4d6c2afd2dd1e897bbfb42c95d 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -6,7 +6,6 @@ usb-serial-option-add-unisoc-vendor-and-tozed-lt70c-product.patch
 iio-adc-palmas_gpadc-fix-null-dereference-on-rmmod.patch
 asoc-intel-bytcr_rt5640-add-quirk-for-the-acer-iconi.patch
 asm-generic-io.h-suppress-endianness-warnings-for-re.patch
-ima-allow-fix-uml-builds.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-probe-errors.patch
 usb-dwc3-fix-runtime-pm-imbalance-on-unbind.patch
 perf-sched-cast-pthread_stack_min-to-int-as-it-may-turn-into-sysconf-__sc_thread_stack_min_value.patch