From 72b775cca03ba6a945b00ce4f4170abef18895d9 Mon Sep 17 00:00:00 2001 From: zcfsite Date: Sat, 14 Oct 2023 17:03:07 +0800 Subject: [PATCH] fix secDetector_hook_tracepoint compile error --- kerneldriver/cases/Makefile | 3 +++ kerneldriver/core/hook_unit/secDetector_hook.h | 4 ++-- kerneldriver/core/response_unit/secDetector_response.c | 2 +- kerneldriver/include/secDetector_workflow_type.h | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kerneldriver/cases/Makefile b/kerneldriver/cases/Makefile index 5361328..9a92161 100644 --- a/kerneldriver/cases/Makefile +++ b/kerneldriver/cases/Makefile @@ -16,6 +16,9 @@ ifndef KDIR KDIR=$(KERNEL_SRC) endif +KBUILD_EXTRA_SYMBOLS += $(PWD)/../core/Module.symvers +export KBUILD_EXTRA_SYMBOLS + all: $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules KCPPFLAGS="${cflags-y}" diff --git a/kerneldriver/core/hook_unit/secDetector_hook.h b/kerneldriver/core/hook_unit/secDetector_hook.h index 7aba3c2..18ece67 100644 --- a/kerneldriver/core/hook_unit/secDetector_hook.h +++ b/kerneldriver/core/hook_unit/secDetector_hook.h @@ -42,7 +42,7 @@ extern void init_secDetector_hook(void); list_for_each_entry_rcu (workflow, &(callback_list), list) { \ if (atomic_read(&workflow->enabled) && \ atomic_read(&workflow->module->enabled)) \ - workflow->workflow_func.func(workflow, PARAMS(args)); \ + workflow->workflow_func.func(PARAMS(args)); \ } \ mutex_unlock(&g_hook_list_array_mutex); \ } while (0) @@ -55,7 +55,7 @@ extern void init_secDetector_hook(void); list_for_each_entry_rcu (workflow, &(callback_list), list) { \ if (atomic_read(&workflow->enabled) && \ atomic_read(&workflow->module->enabled)) \ - workflow->workflow_func.func(workflow, PARAMS(args)); \ + workflow->workflow_func.func(PARAMS(args)); \ } \ rcu_read_unlock(); \ } while (0) diff --git a/kerneldriver/core/response_unit/secDetector_response.c b/kerneldriver/core/response_unit/secDetector_response.c index dad9b3a..cfaed21 100644 --- a/kerneldriver/core/response_unit/secDetector_response.c +++ b/kerneldriver/core/response_unit/secDetector_response.c @@ -58,7 +58,7 @@ void notrace secdetector_report(response_data_t *log) BPF_RB_FORCE_WAKEUP); if (ret != 0) pr_warn("write ringbuf failed\n"); - free(rb_entry); + kfree(rb_entry); } EXPORT_SYMBOL_GPL(secdetector_report); diff --git a/kerneldriver/include/secDetector_workflow_type.h b/kerneldriver/include/secDetector_workflow_type.h index 8e619b4..cc7d500 100644 --- a/kerneldriver/include/secDetector_workflow_type.h +++ b/kerneldriver/include/secDetector_workflow_type.h @@ -23,7 +23,8 @@ struct secDetector_workflow; union workflow_func { void (*func)(void); void (*file_event)(struct secDetector_file *, int); - void (*timer_func)(struct secDetector_workflow *, struct timer_list *); + //void (*timer_func)(struct secDetector_workflow *, struct timer_list *); + void (*timer_func)(struct timer_list *); void (*func_wf)(struct secDetector_workflow *); }; -- Gitee