[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20191121200115.24846-1-navid.emamdoost@gmail.com>
Date: Thu, 21 Nov 2019 14:01:11 -0600
From: Navid Emamdoost <navid.emamdoost@...il.com>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>,
Kate Stewart <kstewart@...uxfoundation.org>,
Navid Emamdoost <navid.emamdoost@...il.com>,
Richard Fontana <rfontana@...hat.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Allison Randal <allison@...utok.net>,
Thomas Gleixner <tglx@...utronix.de>,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: emamd001@....edu
Subject: [PATCH] Input: Fix memory leak in psxpad_spi_probe
In the implementation of psxpad_spi_probe() the allocated memory for
pdev is leaked if psxpad_spi_init_ff() or input_register_polled_device()
fail. The solution is using device managed allocation, like the one used
for pad. Perform the allocation using
devm_input_allocate_polled_device().
Fixes: 8be193c7b1f4 ("Input: add support for PlayStation 1/2 joypads connected via SPI")
Signed-off-by: Navid Emamdoost <navid.emamdoost@...il.com>
---
drivers/input/joystick/psxpad-spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/psxpad-spi.c
index 7eee1b0e360f..99a6052500ca 100644
--- a/drivers/input/joystick/psxpad-spi.c
+++ b/drivers/input/joystick/psxpad-spi.c
@@ -292,7 +292,7 @@ static int psxpad_spi_probe(struct spi_device *spi)
if (!pad)
return -ENOMEM;
- pdev = input_allocate_polled_device();
+ pdev = devm_input_allocate_polled_device(&spi->dev);
if (!pdev) {
dev_err(&spi->dev, "failed to allocate input device\n");
return -ENOMEM;
--
2.17.1
Powered by blists - more mailing lists