[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100422195410.907067324@kvm.kroah.org>
Date: Thu, 22 Apr 2010 12:53:58 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Yong Wang <yong.y.wang@...el.com>,
Dmitry Torokhov <dtor@...l.ru>
Subject: [061/139] Input: sparse-keymap - free the right keymap on error
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yong Wang <yong.y.wang@...ux.intel.com>
commit 88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 upstream.
'map' is allocated in sparse_keymap_setup() and it it the one that should
be freed on error instead of 'keymap'.
Signed-off-by: Yong Wang <yong.y.wang@...el.com>
Signed-off-by: Dmitry Torokhov <dtor@...l.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/input/sparse-keymap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -161,7 +161,7 @@ int sparse_keymap_setup(struct input_dev
return 0;
err_out:
- kfree(keymap);
+ kfree(map);
return error;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists