diff options
| author | Zheyu Ma <zheyuma97@gmail.com> | 2021-06-22 07:11:31 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-15 13:03:32 +0200 |
| commit | 75a8a40d881102973124ad38bd9c1f79f9ab2331 (patch) | |
| tree | 62cd49b67ad484df64a70099daba3b37004289c6 /drivers/pcmcia | |
| parent | 1ff630a6b8853e68a2b3f18eee5ee305e5a010aa (diff) | |
| download | linux-stable-75a8a40d881102973124ad38bd9c1f79f9ab2331.tar.gz linux-stable-75a8a40d881102973124ad38bd9c1f79f9ab2331.tar.bz2 linux-stable-75a8a40d881102973124ad38bd9c1f79f9ab2331.zip | |
pcmcia: i82092: fix a null pointer dereference bug
commit e39cdacf2f664b09029e7c1eb354c91a20c367af upstream.
During the driver loading process, the 'dev' field was not assigned, but
the 'dev' field was referenced in the subsequent 'i82092aa_set_mem_map'
function.
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
CC: <stable@vger.kernel.org>
[linux@dominikbrodowski.net: shorten commit message, add Cc to stable]
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/i82092.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index aae7e6df99cd..ba13e3c3d6b8 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c @@ -105,6 +105,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i for (i = 0;i<socket_count;i++) { sockets[i].card_state = 1; /* 1 = present but empty */ sockets[i].io_base = pci_resource_start(dev, 0); + sockets[i].dev = dev; sockets[i].socket.features |= SS_CAP_PCCARD; sockets[i].socket.map_size = 0x1000; sockets[i].socket.irq_mask = 0; |