diff --git a/dim.spec b/dim.spec index a515a33..4953ee4 100644 --- a/dim.spec +++ b/dim.spec @@ -4,7 +4,7 @@ Name : dim Summary : Dynamic Integrity Measurement Version : 1.0.2 -Release : 4 +Release : 5 License : GPL-2.0 Source0 : %{name}-v%{version}.tar.gz BuildRequires: kernel-devel kernel-headers @@ -13,7 +13,7 @@ Requires : kernel Patch0001: Limit-the-max-line-number-of-policy-and-baseline-par.patch Patch0002: Use-jiffies64-interface-to-set-measure-interval.patch Patch0003: Add-the-owner-of-file-operations.patch - +Patch0004: fix-build-error-in-kernel-6.6.patch %description Dynamic Integrity Measurement @@ -51,6 +51,9 @@ rm -rf %{buildroot} %attr(0400,root,root) /lib/modules/%{kernel_version}/extra/dim/dim_monitor.ko %changelog +* Fri Jan 26 2024 jinlun 1.0.2-5 +- The compilation error asused by the kernel upgrade is rectified. + * Mon Sep 18 2023 jinlun 1.0.2-4 - Fix the concurrent issues with removing module and accessing interfaces. diff --git a/fix-build-error-in-kernel-6.6.patch b/fix-build-error-in-kernel-6.6.patch new file mode 100644 index 0000000..af80998 --- /dev/null +++ b/fix-build-error-in-kernel-6.6.patch @@ -0,0 +1,28 @@ +From dd7f8dd49e927be2219a34bf88d09e80a0e6446d Mon Sep 17 00:00:00 2001 +From: jinlun +Date: Fri, 26 Jan 2024 15:22:42 +0800 +Subject: [PATCH] fix build error in kernel-6.6 + +--- + src/core/dim_core_measure_task.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/dim_core_measure_task.c b/src/core/dim_core_measure_task.c +index f9c53f0..f70d701 100644 +--- a/src/core/dim_core_measure_task.c ++++ b/src/core/dim_core_measure_task.c +@@ -223,7 +223,11 @@ static int update_vma_digest(struct vm_area_struct *vma_start, + return -ENOMEM; + + ret_pages = get_user_pages_remote(vma_start->vm_mm, addr_start, nr_pages, ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,4,0) + 0, pages, NULL, NULL); ++#else ++ 0, pages, NULL); ++#endif + if (ret_pages < 0) { + dim_err("fail to get vma pages: %ld\n", ret_pages); + vfree(pages); +-- +2.33.0 +