* [PATCH] Input: ALPS - fix memory leak when detection fails
@ 2015-02-27 23:53 Dmitry Torokhov
2015-02-28 11:04 ` Pali Rohár
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Torokhov @ 2015-02-27 23:53 UTC (permalink / raw)
To: linux-input; +Cc: Pali Rohár, linux-kernel
This fixes memory leak introduced by commit
a09221e83e13e09a33109b9b037484eade901cea
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/mouse/alps.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index d28726a..1bd15eb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
return -ENOMEM;
error = alps_identify(psmouse, priv);
- if (error)
+ if (error) {
+ kfree(priv);
return error;
+ }
if (set_properties) {
psmouse->vendor = "ALPS";
--
2.2.0.rc0.207.ga3a616c
--
Dmitry
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Input: ALPS - fix memory leak when detection fails
2015-02-27 23:53 [PATCH] Input: ALPS - fix memory leak when detection fails Dmitry Torokhov
@ 2015-02-28 11:04 ` Pali Rohár
0 siblings, 0 replies; 2+ messages in thread
From: Pali Rohár @ 2015-02-28 11:04 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input, linux-kernel
[-- Attachment #1: Type: Text/Plain, Size: 885 bytes --]
On Saturday 28 February 2015 00:53:57 Dmitry Torokhov wrote:
> This fixes memory leak introduced by commit
> a09221e83e13e09a33109b9b037484eade901cea
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/mouse/alps.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/input/mouse/alps.c
> b/drivers/input/mouse/alps.c index d28726a..1bd15eb 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse
> *psmouse, bool set_properties) return -ENOMEM;
>
> error = alps_identify(psmouse, priv);
> - if (error)
> + if (error) {
> + kfree(priv);
> return error;
> + }
>
> if (set_properties) {
> psmouse->vendor = "ALPS";
Acked-by: Pali Rohár <pali.rohar@gmail.com>
--
Pali Rohár
pali.rohar@gmail.com
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-28 11:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-27 23:53 [PATCH] Input: ALPS - fix memory leak when detection fails Dmitry Torokhov
2015-02-28 11:04 ` Pali Rohár
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).