From 046d2b6c1b50b832fd62e75a951bf15ed84d7f43 Mon Sep 17 00:00:00 2001 From: Xiongfeng Wang Date: Tue, 30 Apr 2019 16:25:55 +0800 Subject: [PATCH] firmware: arm_sdei: Prohibit probing in '_sdei_handler' hulk inclusion category: bugfix Bugzilla: 5515 CVE: N/A ---------------------------------------- Functions called in '_sdei_handler' are needed to be marked as 'nokprobe'. Because these functions are called in NMI context and neither the arch-code's debug infrastructure nor kprobes core supports this. Signed-off-by: Xiongfeng Wang Reviewed-by: James Morse Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/firmware/arm_sdei.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index ac21e8d77ecd..502e3dd84f7e 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -164,6 +164,7 @@ static int invoke_sdei_fn(unsigned long function_id, unsigned long arg0, return err; } +NOKPROBE_SYMBOL(invoke_sdei_fn); static struct sdei_event *sdei_event_find(u32 event_num) { @@ -900,6 +901,7 @@ static void sdei_smccc_smc(unsigned long function_id, { arm_smccc_smc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res); } +NOKPROBE_SYMBOL(sdei_smccc_smc); static void sdei_smccc_hvc(unsigned long function_id, unsigned long arg0, unsigned long arg1, @@ -908,6 +910,7 @@ static void sdei_smccc_hvc(unsigned long function_id, { arm_smccc_hvc(function_id, arg0, arg1, arg2, arg3, arg4, 0, 0, res); } +NOKPROBE_SYMBOL(sdei_smccc_hvc); static int sdei_get_conduit(struct platform_device *pdev) { -- GitLab