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

Commit b62917a2 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Herbert Xu
Browse files

crypto: ux500 - fix checks of error code returned by devm_ioremap_resource() 



The change fixes potential oops while accessing iomem on invalid
address, if devm_ioremap_resource() fails due to some reason.

The devm_ioremap_resource() function returns ERR_PTR() and never
returns NULL, which makes useless a following check for NULL.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Fixes: 5a4eea26 ("crypto: ux500 - Use devm_xxx() managed function")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9b52d55f

drivers/crypto/ux500/cryp/cryp_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1440,9 +1440,9 @@ static int ux500_cryp_probe(struct platform_device *pdev) 




	device_data->phybase = res->start;

	device_data->phybase = res->start;

	device_data->base = devm_ioremap_resource(dev, res);

	device_data->base = devm_ioremap_resource(dev, res);

	if (!device_data->base) {

	if (IS_ERR(device_data->base)) {

		dev_err(dev, "[%s]: ioremap failed!", __func__);

		dev_err(dev, "[%s]: ioremap failed!", __func__);

		ret = -ENOMEM;

		ret = PTR_ERR(device_data->base);

		goto out;

		goto out;

	}

	}

drivers/crypto/ux500/hash/hash_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1659,9 +1659,9 @@ static int ux500_hash_probe(struct platform_device *pdev) 




	device_data->phybase = res->start;

	device_data->phybase = res->start;

	device_data->base = devm_ioremap_resource(dev, res);

	device_data->base = devm_ioremap_resource(dev, res);

	if (!device_data->base) {

	if (IS_ERR(device_data->base)) {

		dev_err(dev, "%s: ioremap() failed!\n", __func__);

		dev_err(dev, "%s: ioremap() failed!\n", __func__);

		ret = -ENOMEM;

		ret = PTR_ERR(device_data->base);

		goto out;

		goto out;

	}

	}

	spin_lock_init(&device_data->ctx_lock);

	spin_lock_init(&device_data->ctx_lock);