From: Navid Emamdoost <navid.emamdoost@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Kate Stewart <kstewart@linuxfoundation.org>,
Navid Emamdoost <navid.emamdoost@gmail.com>,
Richard Fontana <rfontana@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Allison Randal <allison@lohutok.net>,
Thomas Gleixner <tglx@linutronix.de>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: emamd001@umn.edu
Subject: [PATCH] Input: Fix memory leak in psxpad_spi_probe
Date: Thu, 21 Nov 2019 14:01:11 -0600 [thread overview]
Message-ID: <20191121200115.24846-1-navid.emamdoost@gmail.com> (raw)
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@gmail.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
next reply other threads:[~2019-11-21 20:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 20:01 Navid Emamdoost [this message]
2019-11-22 19:02 ` [PATCH] Input: Fix memory leak in psxpad_spi_probe Dmitry Torokhov
2019-11-26 9:34 ` Greg Kroah-Hartman
2019-12-07 20:44 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191121200115.24846-1-navid.emamdoost@gmail.com \
--to=navid.emamdoost@gmail.com \
--cc=allison@lohutok.net \
--cc=dmitry.torokhov@gmail.com \
--cc=emamd001@umn.edu \
--cc=gregkh@linuxfoundation.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rfontana@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).