Commit fb2b7765 authored Dec 16, 2022 by Zeng Jingxiang Committed by Zheng Zengkai Dec 16, 2022

mtd: physmap-core: Fix NULL pointer dereferencing in of_select_probe_type()

mainline inclusion
from mainline-v6.1-rc1
commit 8b740c08
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I664DZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8b740c08eb8202817562c358e8d867db0f7d6565


--------------------------------

Coverity complains of a possible NULL dereference:

in of_select_probe_type():
1. returned_null: of_match_device() returns NULL.
2. var_assigned: match = NULL return value from of_match_device()
309	match = of_match_device(of_flash_match, &dev->dev);

3.dereference: Dereferencing the NULL pointer match.
310	probe_type = match->data;

Signed-off-by: Zeng Jingxiang <linuszeng@tencent.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220727060302.1560325-1-zengjx95@gmail.com


Signed-off-by: Xiang Yang <xiangyang3@huawei.com>
Reviewed-by: yiyang <yiyang13@huawei.com>
Reviewed-by: guozihua <guozihua@huawei.com>
Reviewed-by: GONG, Ruiqi <gongruiqi1@huawei.com>
Reviewed-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: Wang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent c3cbc500

drivers/mtd/maps/physmap-core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,9 @@ static const char of_select_probe_type(struct platform_device dev)
		const char *probe_type;

		match = of_match_device(of_flash_match, &dev->dev);
		if (!match)
		return NULL;

		probe_type = match->data;
		if (probe_type)
		return probe_type;