From: Sasha Levin Date: Sat, 2 Nov 2024 11:11:44 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v4.19.323~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f99eebfa2cf637ba5266139215880448e722fc69;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch b/queue-4.19/firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch new file mode 100644 index 00000000000..45d21f370f4 --- /dev/null +++ b/queue-4.19/firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch @@ -0,0 +1,38 @@ +From ccfe5191e5f1fcb0a43e7701bd43d7d7efea1234 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2024 16:47:40 +0800 +Subject: firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state() + +From: Xiongfeng Wang + +[ Upstream commit c83212d79be2c9886d3e6039759ecd388fd5fed1 ] + +In sdei_device_freeze(), the input parameter of cpuhp_remove_state() is +passed as 'sdei_entry_point' by mistake. Change it to 'sdei_hp_state'. + +Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG") +Signed-off-by: Xiongfeng Wang +Reviewed-by: James Morse +Link: https://lore.kernel.org/r/20241016084740.183353-1-wangxiongfeng2@huawei.com +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/firmware/arm_sdei.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c +index ea2c2bdcf4f7f..eb99a02e51141 100644 +--- a/drivers/firmware/arm_sdei.c ++++ b/drivers/firmware/arm_sdei.c +@@ -800,7 +800,7 @@ static int sdei_device_freeze(struct device *dev) + int err; + + /* unregister private events */ +- cpuhp_remove_state(sdei_entry_point); ++ cpuhp_remove_state(sdei_hp_state); + + err = sdei_unregister_shared(); + if (err) +-- +2.43.0 + diff --git a/queue-4.19/series b/queue-4.19/series index c81917b7db5..e20c975a14a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -333,3 +333,4 @@ bpf-fix-out-of-bounds-write-in-trie_get_next_key.patch net-support-ip-generic-csum-processing-in-skb_csum_h.patch net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch +firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch