From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932367Ab0DVUVF (ORCPT ); Thu, 22 Apr 2010 16:21:05 -0400 Received: from kroah.org ([198.145.64.141]:59742 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757960Ab0DVUA3 (ORCPT ); Thu, 22 Apr 2010 16:00:29 -0400 X-Mailbox-Line: From gregkh@kvm.kroah.org Thu Apr 22 12:54:10 2010 Message-Id: <20100422195410.907067324@kvm.kroah.org> User-Agent: quilt/0.48-4.4 Date: Thu, 22 Apr 2010 12:53:58 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Yong Wang , Dmitry Torokhov Subject: [061/139] Input: sparse-keymap - free the right keymap on error In-Reply-To: <20100422195715.GA25490@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.33-stable review patch. If anyone has any objections, please let us know. ------------------ From: Yong Wang 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 Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- 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; }