packages/kpatch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!121 fix function ptr relocation and strip .BTF section for ko

Browse Source 
From: @pshysimon 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95
This commit is contained in:
openeuler-ci-bot 2024-05-06 13:03:52 +00:00 committed by Gitee
commit 48e93f7b03
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch Normal file
View File

@ -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

9
kpatch.spec
View File

@ -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