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

Commit 73522d08 authored by Tom Seewald's avatar Tom Seewald Committed by Greg Kroah-Hartman
Browse files

char: hpet: add checks after calling ioremap 



[ Upstream commit b11701c933112d49b808dee01cb7ff854ba6a77a ]

The function hpet_resources() calls ioremap() two times, but in both
cases it does not check if ioremap() returned a null pointer. Fix this
by adding null pointer checks and returning an appropriate error.

Signed-off-by: default avatarTom Seewald <tseewald@gmail.com>
Link: https://lore.kernel.org/r/20210503115736.2104747-30-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 48ac9e47

drivers/char/hpet.c

+4 −0
Original line number Diff line number Diff line
@@ -975,6 +975,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) 
	if (ACPI_SUCCESS(status)) {

		hdp->hd_phys_address = addr.address.minimum;

		hdp->hd_address = ioremap(addr.address.minimum, addr.address.address_length);

		if (!hdp->hd_address)

			return AE_ERROR;



		if (hpet_is_known(hdp)) {

			iounmap(hdp->hd_address);
@@ -988,6 +990,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) 
		hdp->hd_phys_address = fixmem32->address;

		hdp->hd_address = ioremap(fixmem32->address,

						HPET_RANGE_SIZE);

		if (!hdp->hd_address)

			return AE_ERROR;



		if (hpet_is_known(hdp)) {

			iounmap(hdp->hd_address);