54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
From 9746f100debb0c17397c47f5d3abbe7ca4bde221 Mon Sep 17 00:00:00 2001
|
|
From: Zhipeng Xie <xiezhipeng1@huawei.com>
|
|
Date: Tue, 25 Feb 2020 23:40:37 -0500
|
|
Subject: [PATCH 07/37] livepatch-patch-hook: support no active after load
|
|
|
|
suppport Don't active patch after loading the patch when
|
|
DISABLE_AFTER_LOAD is set.
|
|
|
|
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
|
|
---
|
|
kmod/patch/livepatch-patch-hook.c | 2 ++
|
|
kpatch-build/kpatch-build | 5 +++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/kmod/patch/livepatch-patch-hook.c b/kmod/patch/livepatch-patch-hook.c
|
|
index 3d13ab9..b578ef3 100644
|
|
--- a/kmod/patch/livepatch-patch-hook.c
|
|
+++ b/kmod/patch/livepatch-patch-hook.c
|
|
@@ -576,6 +576,7 @@ static int __init patch_init(void)
|
|
}
|
|
#endif
|
|
|
|
+#if !defined(DISABLE_AFTER_LOAD)
|
|
ret = klp_enable_patch(lpatch);
|
|
if (ret) {
|
|
#ifndef HAVE_SIMPLE_ENABLE
|
|
@@ -584,6 +585,7 @@ static int __init patch_init(void)
|
|
patch_free_livepatch(lpatch);
|
|
return ret;
|
|
}
|
|
+#endif
|
|
|
|
return 0;
|
|
out:
|
|
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
|
|
index 73f8976..00ba9ac 100755
|
|
--- a/kpatch-build/kpatch-build
|
|
+++ b/kpatch-build/kpatch-build
|
|
@@ -1160,6 +1160,11 @@ export KCFLAGS="-I$DATADIR/patch $ARCH_KCFLAGS"
|
|
if [[ "$USE_KLP" -eq 0 ]]; then
|
|
export KCPPFLAGS="-D__KPATCH_MODULE__"
|
|
fi
|
|
+
|
|
+if [[ -n "$DISABLE_AFTER_LOAD" ]];then
|
|
+ export KCPPFLAGS="-DDISABLE_AFTER_LOAD $KCPPFLAGS"
|
|
+fi
|
|
+
|
|
save_env
|
|
|
|
echo "Building patch module: $MODNAME.ko"
|
|
--
|
|
2.33.0
|
|
|