From b11caf3c2e63432adcd4d55f0ae41d35fd286f1c Mon Sep 17 00:00:00 2001
From: caixiaomeng 00662745 <caixiaomeng2@huawei.com>
Date: Mon, 6 May 2024 20:51:41 +0800
Subject: [PATCH] fix function ptr relocation and strip .BTF section for ko

(cherry picked from commit ebcfccbc3f99eb9e95ce40deaba685b7d4b86b29)
---
 ...-relocation-and-strip-.BTF-section-f.patch | 40 +++++++++++++++++++
 kpatch.spec                                   |  9 ++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch

diff --git a/huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch b/huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch
new file mode 100644
index 0000000..0b29949
--- /dev/null
+++ b/huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch
@@ -0,0 +1,40 @@
+From 9a1729d47ea279a63c29e45ffee9892f95ed18c2 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 6 May 2024 19:18:02 +0800
+Subject: [PATCH] fix function ptr relocation and strip .BTF section for ko
+
+---
+ kpatch-build/create-diff-object.c | 2 +-
+ kpatch-build/kpatch-build         | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
+index 5de19f4..73b8337 100644
+--- a/kpatch-build/create-diff-object.c
++++ b/kpatch-build/create-diff-object.c
+@@ -3444,7 +3444,7 @@ static int function_ptr_rela(const struct rela *rela)
+ 	int entry_offset = 0;
+ 
+ 	if (getenv("CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS"))
+-		entry_offset = 20;
++		entry_offset = 16;
+ 
+ 	return (rela_toc && rela_toc->sym->type == STT_FUNC &&
+ 		!rela_toc->sym->parent &&
+diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
+index 17cb83d..edc05b3 100755
+--- a/kpatch-build/kpatch-build
++++ b/kpatch-build/kpatch-build
+@@ -1555,6 +1555,9 @@ if [[ "$USE_KLP" -eq 1 ]]; then
+ 	[[ "$rc" -ne 0 ]] && die "create-klp-module: exited with return code: $rc"
+ fi
+ 
++objcopy --remove-section=.BTF "$TEMPDIR/patch/$MODNAME.ko" "$TEMPDIR/patch/${MODNAME}_tmp.ko"
++mv "$TEMPDIR/patch/${MODNAME}_tmp.ko" "$TEMPDIR/patch/$MODNAME.ko"
++
+ if [[ -n "$CONFIG_MODVERSIONS" ]]; then
+     # Check that final module does not reference symbols with different version
+     # than the target kernel
+-- 
+2.33.0
+
diff --git a/kpatch.spec b/kpatch.spec
index 8043097..14cae90 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,7 +1,7 @@
 Name:           kpatch
 Epoch:          1
 Version:        0.9.9
-Release:        4
+Release:        5
 Summary:        A Linux dynamic kernel patching infrastructure
 
 License:        GPLv2
@@ -56,6 +56,7 @@ Patch0039:0039-build-support-for-building-with-clang.patch
 Patch9001:huawei-fix-function-ptr-relocation.patch
 Patch9002:huawei-lookup.c-ignore-BTF-ID-when-matching-locals.patch
 Patch9003:huawei-adapt-kpatch-to-6.6-kernel-and-fix-bundle-symbols-ch.patch
+Patch9004:huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch
 
 BuildRequires:  gcc elfutils-libelf-devel kernel-devel git
 %ifarch ppc64le
@@ -119,6 +120,12 @@ popd
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon May 6 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1:0.9.9-5
+- Type: bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix function ptr relocation and strip .BTF section for ko
+
 * Tue Apr 30 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1:0.9.9-4
 - Type: bugfix
 - CVE:NA
-- 
Gitee