]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firmware: meson_sm: fix to avoid potential NULL pointer dereference
authorZhang Shurong <zhang_shurong@foxmail.com>
Sat, 15 Jul 2023 14:13:38 +0000 (22:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Sep 2023 07:42:42 +0000 (09:42 +0200)
[ Upstream commit f2ed165619c16577c02b703a114a1f6b52026df4 ]

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: Zhang Shurong <zhang_shurong@foxmail.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/tencent_AA08AAA6C4F34D53ADCE962E188A879B8206@qq.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/meson/meson_sm.c

index 77aa5c6398aa66c0cb3558da77b006f6e1c939a2..d081a6312627b0e767149688414589ac5b2a8cfc 100644 (file)
@@ -292,6 +292,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,