From e5d5b0953c25f06bda77ae227fc1f15fece5d88a Mon Sep 17 00:00:00 2001 From: jixj Date: Wed, 16 Dec 2020 14:51:22 +0800 Subject: [PATCH] mmi_sigprint: Fix CFI check failure Kernel changes the signal callback function parameter from "sigifno" to "kernel_siginfo" on kernel-5.4 change: ae7795bc6187 signal: Distinguish between kernel_siginfo and siginfo Change-Id: If120a520bc949b354855f804fcfb3fca97224f47 Reviewed-on: https://gerrit.mot.com/1828677 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- drivers/misc/mmi_sigprint/mmi_sigprint.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/misc/mmi_sigprint/mmi_sigprint.c b/drivers/misc/mmi_sigprint/mmi_sigprint.c index 89528e534e89..50afaa2bc427 100644 --- a/drivers/misc/mmi_sigprint/mmi_sigprint.c +++ b/drivers/misc/mmi_sigprint/mmi_sigprint.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -101,8 +102,13 @@ static void probe_signal_deliver(void *ignore, int sig, struct siginfo *info, } */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) static void probe_death_signal(void *ignore, int sig, struct siginfo *info, struct task_struct *task, int _group, int result) +#else +static void probe_death_signal(void *ignore, int sig, struct kernel_siginfo *info, + struct task_struct *task, int _group, int result) +#endif { struct signal_struct *signal = task->signal; unsigned int state;