xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: mux: reg: check return value after calling platform_get_resource()

Browse Source 
[ Upstream commit 2d47b79d2bd39cc6369eccf94a06568d84c906ae ]

It will cause null-ptr-deref in resource_size(), if platform_get_resource()
returns NULL, move calling resource_size() after devm_ioremap_resource() that
will check 'res' to avoid null-ptr-deref.
And use devm_platform_get_and_ioremap_resource() to simplify code.

Fixes: b3fdd32799 ("i2c: mux: Add register-based mux i2c-mux-reg")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2022-10-29 17:38:25 +08:00
committed by Greg Kroah-Hartman
parent 6d79546622
commit 61df25c41b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/i2c/muxes/i2c-mux-reg.c
View File

@@ -183,13 +183,12 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
if (!mux->data.reg) { if (!mux->data.reg) {
dev_info(&pdev->dev, dev_info(&pdev->dev,
"Register not set, using platform resource\n"); "Register not set, using platform resource\n");
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mux->data.reg = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
mux->data.reg_size = resource_size(res);
mux->data.reg = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mux->data.reg)) { if (IS_ERR(mux->data.reg)) {
ret = PTR_ERR(mux->data.reg); ret = PTR_ERR(mux->data.reg);
goto err_put_parent; goto err_put_parent;
} }
mux->data.reg_size = resource_size(res);
} }
if (mux->data.reg_size != 4 && mux->data.reg_size != 2 && if (mux->data.reg_size != 4 && mux->data.reg_size != 2 &&