mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

fsi: Aspeed: Fix a potential double free

Browse source 
[ Upstream commit 83ba7e895d ]

A struct device can never be devm_alloc()'ed.
Here, it is embedded in "struct fsi_master", and "struct fsi_master" is
embedded in "struct fsi_master_aspeed".

Since "struct device" is embedded, the data structure embedding it must be
released with the release function, as is already done here.

So use kzalloc() instead of devm_kzalloc() when allocating "aspeed" and
update all error handling branches accordingly.

This prevent a potential double free().

This also fix another issue if opb_readl() fails. Instead of a direct
return, it now jumps in the error handling path.

Fixes: 606397d67f ("fsi: Add ast2600 master driver")
Suggested-by: Greg KH <gregkh@linuxfoundation.org>
Suggested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/2c123f8b0a40dc1a061fae982169fe030b4f47e6.1641765339.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2022-01-09 22:56:10 +01:00 committed by Greg Kroah-Hartman
parent 9f09e78db5
commit a789c12fe4
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/fsi/fsi-master-aspeed.c
View file

@ -542,25 +542,28 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)
return rc; return rc;
} }
aspeed = devm_kzalloc(&pdev->dev, sizeof(*aspeed), GFP_KERNEL); aspeed = kzalloc(sizeof(*aspeed), GFP_KERNEL);
if (!aspeed) if (!aspeed)
return -ENOMEM; return -ENOMEM;
aspeed->dev = &pdev->dev; aspeed->dev = &pdev->dev;
aspeed->base = devm_platform_ioremap_resource(pdev, 0); aspeed->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(aspeed->base)) if (IS_ERR(aspeed->base)) {
return PTR_ERR(aspeed->base); rc = PTR_ERR(aspeed->base);
goto err_free_aspeed;
}
aspeed->clk = devm_clk_get(aspeed->dev, NULL); aspeed->clk = devm_clk_get(aspeed->dev, NULL);
if (IS_ERR(aspeed->clk)) { if (IS_ERR(aspeed->clk)) {
dev_err(aspeed->dev, "couldn't get clock\n"); dev_err(aspeed->dev, "couldn't get clock\n");
return PTR_ERR(aspeed->clk); rc = PTR_ERR(aspeed->clk);
goto err_free_aspeed;
} }
rc = clk_prepare_enable(aspeed->clk); rc = clk_prepare_enable(aspeed->clk);
if (rc) { if (rc) {
dev_err(aspeed->dev, "couldn't enable clock\n"); dev_err(aspeed->dev, "couldn't enable clock\n");
return rc; goto err_free_aspeed;
} }
rc = setup_cfam_reset(aspeed); rc = setup_cfam_reset(aspeed);
@ -595,7 +598,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)
rc = opb_readl(aspeed, ctrl_base + FSI_MVER, &raw); rc = opb_readl(aspeed, ctrl_base + FSI_MVER, &raw);
if (rc) { if (rc) {
dev_err(&pdev->dev, "failed to read hub version\n"); dev_err(&pdev->dev, "failed to read hub version\n");
return rc; goto err_release;
} }
reg = be32_to_cpu(raw); reg = be32_to_cpu(raw);
@ -634,6 +637,8 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev)
err_release: err_release:
clk_disable_unprepare(aspeed->clk); clk_disable_unprepare(aspeed->clk);
err_free_aspeed:
kfree(aspeed);
return rc; return rc;
} }