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

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

crypto: atmel - 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: b0e8b341 ("crypto: atmel - use devm_xxx() managed function")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 84a0ced0

drivers/crypto/atmel-aes.c

+2 −2
Original line number Diff line number Diff line
@@ -2079,9 +2079,9 @@ static int atmel_aes_probe(struct platform_device *pdev) 
	}



	aes_dd->io_base = devm_ioremap_resource(&pdev->dev, aes_res);

	if (!aes_dd->io_base) {

	if (IS_ERR(aes_dd->io_base)) {

		dev_err(dev, "can't ioremap\n");

		err = -ENOMEM;

		err = PTR_ERR(aes_dd->io_base);

		goto res_err;

	}

drivers/crypto/atmel-sha.c

+2 −2
Original line number Diff line number Diff line
@@ -1486,9 +1486,9 @@ static int atmel_sha_probe(struct platform_device *pdev) 
	}



	sha_dd->io_base = devm_ioremap_resource(&pdev->dev, sha_res);

	if (!sha_dd->io_base) {

	if (IS_ERR(sha_dd->io_base)) {

		dev_err(dev, "can't ioremap\n");

		err = -ENOMEM;

		err = PTR_ERR(sha_dd->io_base);

		goto res_err;

	}

drivers/crypto/atmel-tdes.c

+2 −2
Original line number Diff line number Diff line
@@ -1417,9 +1417,9 @@ static int atmel_tdes_probe(struct platform_device *pdev) 
	}



	tdes_dd->io_base = devm_ioremap_resource(&pdev->dev, tdes_res);

	if (!tdes_dd->io_base) {

	if (IS_ERR(tdes_dd->io_base)) {

		dev_err(dev, "can't ioremap\n");

		err = -ENOMEM;

		err = PTR_ERR(tdes_dd->io_base);

		goto res_err;

	}