From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yongtaek Lee Subject: [PATCH] Input: evdev - Fix incorrect kfree of err_free_client after vzalloc Date: Thu, 12 Jun 2014 10:45:37 +0900 Message-ID: <1402537537-17945-1-git-send-email-ytk.lee@samsung.com> Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:60603 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754411AbaFLBpt (ORCPT ); Wed, 11 Jun 2014 21:45:49 -0400 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: rydberg@euromail.se, dmitry.torokhov@gmail.com, daniels@collabora.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, ytk.lee@samsung.com This bug was introduced by commit 92eb77d ("Input: evdev - fall back to vmalloc for client event buffer"). vzalloc is used to alloc memory as fallback in case of failure of kzalloc. But err_free_client was not considered on below case. 1. kzalloc fail 2. vzalloc success 3. evdev_open_device fail 4. kfree So that address checking is needed to call correct free function. Signed-off-by: Yongtaek Lee Reviewed-by: Daniel Stone --- drivers/input/evdev.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index ce953d8..f60daa0 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -422,7 +422,10 @@ static int evdev_open(struct inode *inode, struct file *file) err_free_client: evdev_detach_client(evdev, client); - kfree(client); + if (is_vmalloc_addr(client)) + vfree(client); + else + kfree(client); return error; } -- 1.7.1