Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Armin Wolf <W_Armin@gmx.de>
To:     linux@dominikbrodowski.net
Cc:     logang@deltatee.com, gregkh@linuxfoundation.org, rafael@kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db()
Date:   Fri, 12 May 2023 20:45:29 +0200
Message-Id: <20230512184529.5094-1-W_Armin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:FXyfl2Ke9V8=;RjMkDwHamgIoJLMcvzeGhis8UEq
 KTmBRrj2KZQnHGhf9P6ZZwnmxVk/foKaH8+/3ufxh7VrXwUfS30ORS4sRxGwXeS1IdVsxGuxS
 I/MAUD1c6Sv0J2vkvp5pQTnxavjje/b+Pa7pHIqmAvxlJnj37d+JD6XkmiTRMNDMfNPUDOqN8
 pRcDxKDDt38d2EZYgVLg9+maV5kv9iW7klrHbWZg7bbgMmozFMxtwyYpsweYkbfNgfCrq5Jvs
 xD87p91YYulVIw0biJ0TgiL2Yg4hvRdbyjW3UkgqdaEFUDV5x5zitO9w/XJ2NAtqF5ABIny23
 lUtsFO/DqsQHuadoye1YizfBwjtrjHcMPPNmv29sJBfARs2nbkMPY9lZ7iSIrrl3Qfgzm4kSP
 LG0skV/McvjB9xW29ZMbSVgst0EBWvqiaT+CkA+u35Sjt01kHtzURVzw66qv2XY+k4XuzaBk7
 c/PeVKKtzmnzpEilPRJKS8jEg7ZWvrKnUfy6cTGgqIY0H3mQ9IhlJmL5eHBudQPxdtQFB5MLn
 Llwsmol3DCV5Lk9w+qy7StfIG7r3Kd88AfJ+u9paJWwgXhgpOjKQR9cWXYmjIW5Q+CDWBbNIA
 kgdRZmd13imgCMZd87C9eb1szrh3d0PnYJ1UDZOHSNBSGY5bir/unl7bOzXgffgIli3fkH26o
 fEav834mg+z44IQ7CvyS6ycLTXdH72PKo+GxsDH3CeaT9o0WOtmVph6QsyBz+/PDmUOH8oCsE
 AZwknpbjAkmaAjMOwuRZLIO8jplJYQZwj31IzJRx8PpeM33G7RzCC73tC4Ni4PtxNcBPGLoOh
 87bsqPiSV82bAfswbFdm9Tc2hpvuP6crKmV6hbBmGOjnZnNfZ5uO34AYUgqY7DSKhLY6bN8SR
 iyKclBHcwTiGaOv2gZYJtwd4uk3NDMnLfx6F6j92O4ytl5fXs4Z9rDXmzxYo1KIsjjEEKVYoZ
 wZeFRlsUVtn1f22PIltBgw4uOXw=
Precedence: bulk

When nonstatic_release_resource_db() frees all resources associated
with an PCMCIA socket, it forgets to free socket_data too, causing
a memory leak observable with kmemleak:

unreferenced object 0xc28d1000 (size 64):
  comm "systemd-udevd", pid 297, jiffies 4294898478 (age 194.484s)
  hex dump (first 32 bytes):
    00 00 00 00 00 00 00 00 f0 85 0e c3 00 00 00 00  ................
    00 00 00 00 0c 10 8d c2 00 00 00 00 00 00 00 00  ................
  backtrace:
    [<ffda4245>] __kmem_cache_alloc_node+0x2d7/0x4a0
    [<7e51f0c8>] kmalloc_trace+0x31/0xa4
    [<d52b4ca0>] nonstatic_init+0x24/0x1a4 [pcmcia_rsrc]
    [<a2f13e08>] pcmcia_register_socket+0x200/0x35c [pcmcia_core]
    [<a728be1b>] yenta_probe+0x4d8/0xa70 [yenta_socket]
    [<c48fac39>] pci_device_probe+0x99/0x194
    [<84b7c690>] really_probe+0x181/0x45c
    [<8060fe6e>] __driver_probe_device+0x75/0x1f4
    [<b9b76f43>] driver_probe_device+0x28/0xac
    [<648b766f>] __driver_attach+0xeb/0x1e4
    [<6e9659eb>] bus_for_each_dev+0x61/0xb4
    [<25a669f3>] driver_attach+0x1e/0x28
    [<d8671d6b>] bus_add_driver+0x102/0x20c
    [<df0d323c>] driver_register+0x5b/0x120
    [<942cd8a4>] __pci_register_driver+0x44/0x4c
    [<e536027e>] __UNIQUE_ID___addressable_cleanup_module188+0x1c/0xfffff0=
00 [iTCO_vendor_support]

Fix this by freeing socket_data too.

Tested on a Acer Travelmate 4002WLMi by manually binding/unbinding
the yenta_cardbus driver (yenta_socket).

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/pcmcia/rsrc_nonstatic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstat=
ic.c
index 471e0c5815f3..bf9d070a4496 100644
=2D-- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -1053,6 +1053,8 @@ static void nonstatic_release_resource_db(struct pcm=
cia_socket *s)
 		q =3D p->next;
 		kfree(p);
 	}
+
+	kfree(data);
 }


=2D-
2.30.2