lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 099/320] pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region()
    Date
    From: Zhou Qingyang <zhou1615@umn.edu>

    [ Upstream commit ca0fe0d7c35c97528bdf621fdca75f13157c27af ]

    In __nonstatic_find_io_region(), pcmcia_make_resource() is assigned to
    res and used in pci_bus_alloc_resource(). There is a dereference of res
    in pci_bus_alloc_resource(), which could lead to a NULL pointer
    dereference on failure of pcmcia_make_resource().

    Fix this bug by adding a check of res.

    This bug was found by a static analyzer. The analysis employs
    differential checking to identify inconsistent security operations
    (e.g., checks or kfrees) between two code paths and confirms that the
    inconsistent operations are not recovered in the current function or
    the callers, so they constitute bugs.

    Note that, as a bug found by static analysis, it can be a false
    positive or hard to trigger. Multiple researchers have cross-reviewed
    the bug.

    Builds with CONFIG_PCCARD_NONSTATIC=y show no new warnings,
    and our static analyzer no longer warns about this code.

    Fixes: 49b1153adfe1 ("pcmcia: move all pcmcia_resource_ops providers into one module")
    Signed-off-by: Zhou Qingyang <zhou1615@umn.edu>
    [linux@dominikbrodowski.net: Fix typo in commit message]
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pcmcia/rsrc_nonstatic.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
    index 9e6922c08ef62..03ae998675e87 100644
    --- a/drivers/pcmcia/rsrc_nonstatic.c
    +++ b/drivers/pcmcia/rsrc_nonstatic.c
    @@ -690,6 +690,9 @@ static struct resource *__nonstatic_find_io_region(struct pcmcia_socket *s,
    unsigned long min = base;
    int ret;

    + if (!res)
    + return NULL;
    +
    data.mask = align - 1;
    data.offset = base & data.mask;
    data.map = &s_data->io_db;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:11    [W:2.764 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site