lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 097/177] char: hpet: add checks after calling ioremap
    Date
    From: Tom Seewald <tseewald@gmail.com>

    [ 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: Tom Seewald <tseewald@gmail.com>
    Link: https://lore.kernel.org/r/20210503115736.2104747-30-gregkh@linuxfoundation.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/char/hpet.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
    index 3e31740444f1..d390ab5e51d3 100644
    --- a/drivers/char/hpet.c
    +++ b/drivers/char/hpet.c
    @@ -969,6 +969,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);
    @@ -982,6 +984,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);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 17:35    [W:4.084 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site