From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Aug 2021 10:53:18 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.4.280~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae1c35a284a62f3ded91093e8e28f63650c4fe7a;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch
---

diff --git a/queue-4.9/pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch b/queue-4.9/pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch
new file mode 100644
index 00000000000..43f86bcf838
--- /dev/null
+++ b/queue-4.9/pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch
@@ -0,0 +1,32 @@
+From e39cdacf2f664b09029e7c1eb354c91a20c367af Mon Sep 17 00:00:00 2001
+From: Zheyu Ma <zheyuma97@gmail.com>
+Date: Tue, 22 Jun 2021 07:11:31 +0000
+Subject: pcmcia: i82092: fix a null pointer dereference bug
+
+From: Zheyu Ma <zheyuma97@gmail.com>
+
+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>
+---
+ drivers/pcmcia/i82092.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/pcmcia/i82092.c
++++ b/drivers/pcmcia/i82092.c
+@@ -105,6 +105,7 @@ static int i82092aa_pci_probe(struct pci
+ 	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;
diff --git a/queue-4.9/series b/queue-4.9/series
index 70c386a90ae..209ef9fdfb9 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -18,3 +18,4 @@ media-rtl28xxu-fix-zero-length-control-request.patch
 pipe-increase-minimum-default-pipe-size-to-2-pages.patch
 serial-8250-mask-out-floating-16-32-bit-bus-bits.patch
 mips-malta-do-not-byte-swap-accesses-to-the-cbus-uart.patch
+pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch