Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba9c24c authored by Zhang Shurong's avatar Zhang Shurong Committed by Greg Kroah-Hartman
Browse files

firmware: meson_sm: fix to avoid potential NULL pointer dereference 



commit f2ed165619c16577c02b703a114a1f6b52026df4 upstream.

of_match_device() may fail and returns a NULL pointer.

Fix this by checking the return value of of_match_device.

Fixes: 8cde3c2153e8 ("firmware: meson_sm: Rework driver as a proper platform driver")
Signed-off-by: default avatarZhang Shurong <zhang_shurong@foxmail.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/tencent_AA08AAA6C4F34D53ADCE962E188A879B8206@qq.com


Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35a5acfa

drivers/firmware/meson/meson_sm.c

+2 −0
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ static int __init meson_sm_probe(struct platform_device *pdev) 
		return -ENOMEM;



	chip = of_match_device(meson_sm_ids, dev)->data;

	if (!chip)

		return -EINVAL;



	if (chip->cmd_shmem_in_base) {

		fw->sm_shmem_in_base = meson_sm_map_shmem(chip->cmd_shmem_in_base,