diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-18 02:33:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-18 02:33:38 +0100 |
| commit | b5408a0879b82101f69b6bf3bc29b6e9e4969941 (patch) | |
| tree | 476433e68266a2cc5100b7d966badf13755311c8 /dev-util/sysdig-kmod | |
| parent | 83b5cde41ddb8fd20de4536dd68eb08da42d013e (diff) | |
gentoo auto-resync : 18:07:2022 - 02:33:38
Diffstat (limited to 'dev-util/sysdig-kmod')
| -rw-r--r-- | dev-util/sysdig-kmod/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch | 63 | ||||
| -rw-r--r-- | dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild | 2 |
3 files changed, 67 insertions, 1 deletions
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest index f5cf583fb0ee..c11664a2c347 100644 --- a/dev-util/sysdig-kmod/Manifest +++ b/dev-util/sysdig-kmod/Manifest @@ -1,3 +1,4 @@ +AUX 0.27.1-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B ecd23377a65d2093c7d97158abe3417da2a45d7e10d692731ec3aa4cd1721e1294c516c61668aa30b6d290963a7126bd0a3f1df3da9e6b54d6ab4978bd14aac8 SHA512 a92592ce54b53be679ce094b578ce7c55366a8e3ef5680b83eb09b86b7fbcd3187f302e98424deb4fdcc37c5898167a8309f98e6ec3dd81b0aa47774409d3121 DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 -EBUILD sysdig-kmod-0.27.1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd +EBUILD sysdig-kmod-0.27.1.ebuild 1008 BLAKE2B 9e9ecf6e83a5de4690f2dc3dee217fcd05ec51f4d42ab7a674bfe428f8690adacb42c6f5de7ce5b7261bd2a8d6f1cc9f4e3852cd2077d60b901d032ff0392327 SHA512 680989517e9f3e409ab6084af0c1559a771b900976c918aeedff71b014f578fe88ad7bed4db1b33c9474baf33ceef392c8706ee73de7799f201ed0ce6c2b1a52 MISC metadata.xml 246 BLAKE2B 35cfb0369ed2d389a18f9df8c6ffa8d61a2ffd51a358d720686706b6e694696fd1c46eab08be11e3733bf11edccb3734869b12612829858131072cae4fa98095 SHA512 113c52a3246e912aa3d5369eef4952e480d8f5a45b6656676fae8b10d3125d7a55430c87680b9f985f11fa58b3f29c1d13b3fdf94896c2f61c0451d0ca6a44a9 diff --git a/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch b/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch new file mode 100644 index 000000000000..8c3ade53fb07 --- /dev/null +++ b/dev-util/sysdig-kmod/files/0.27.1-fix-kmod-build-on-5.18+.patch @@ -0,0 +1,63 @@ + +Bug: https://bugs.gentoo.org/852314 +Source: https://github.com/falcosecurity/libs/pull/411/commits/36e945af4feb31c8b875f7d4624592b0c1ff929d + +From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001 +From: Federico Di Pierro <nierro92@gmail.com> +Date: Mon, 20 Jun 2022 14:26:39 +0200 +Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18. + +Signed-off-by: Federico Di Pierro <nierro92@gmail.com> +--- + driver/main.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/driver/main.c b/driver/main.c +index 6b5ae461a..e606cc2f8 100644 +--- a/driver/main.c ++++ b/driver/main.c +@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors"); + #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data, args) + #endif + +-#ifndef pgprot_encrypted +-#define pgprot_encrypted(x) (x) ++// Allow build even on arch where PAGE_ENC is not implemented ++#ifndef _PAGE_ENC ++#define _PAGE_ENC 0 + #endif + + struct ppm_device { +@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) + + pfn = vmalloc_to_pfn(vmalloc_area_ptr); + ++ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; + ret = remap_pfn_range(vma, useraddr, pfn, +- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); ++ PAGE_SIZE, vma->vm_page_prot); + if (ret < 0) { + pr_err("remap_pfn_range failed (1)\n"); + goto cleanup_mmap; +@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) + while (mlength > 0) { + pfn = vmalloc_to_pfn(vmalloc_area_ptr); + ++ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; + ret = remap_pfn_range(vma, useraddr, pfn, +- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); ++ PAGE_SIZE, vma->vm_page_prot); + if (ret < 0) { + pr_err("remap_pfn_range failed (1)\n"); + goto cleanup_mmap; +@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct vm_area_struct *vma) + while (mlength > 0) { + pfn = vmalloc_to_pfn(vmalloc_area_ptr); + ++ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED) | _PAGE_ENC; + ret = remap_pfn_range(vma, useraddr, pfn, +- PAGE_SIZE, pgprot_encrypted(PAGE_SHARED)); ++ PAGE_SIZE, vma->vm_page_prot); + if (ret < 0) { + pr_err("remap_pfn_range failed (1)\n"); + goto cleanup_mmap; diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild index ba7201399d5c..b679552f204c 100644 --- a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild +++ b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild @@ -19,6 +19,8 @@ RDEPEND="!<=dev-util/sysdig-0.26.4[modules]" CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" +PATCHES=( "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch ) + pkg_pretend() { linux-mod_pkg_setup } |