[PATCH] Input: evdev: correct handling of memory allocation failure of evdev_client

From	Aniroop Mathur <a.mathur@samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH] Input: evdev: correct handling of memory allocation failure of evdev_client
Date	2016-01-25 18:50 +0100
Message-ID	<qUTr3-7vm-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Lets fix twice checking of memory allocation failure of evdev_client
structure when allocated successfully.

Signed-off-by: Aniroop Mathur <a.mathur@samsung.com>
---
 drivers/input/evdev.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index e9ae3d5..102b5d9 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -503,10 +503,11 @@ static int evdev_open(struct inode *inode, struct file *file)
 	int error;
 
 	client = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
-	if (!client)
+	if (!client) {
 		client = vzalloc(size);
-	if (!client)
-		return -ENOMEM;
+		if (!client)
+			return -ENOMEM;
+	}
 
 	client->bufsize = bufsize;
 	spin_lock_init(&client->buffer_lock);
-- 
2.6.2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] Input: evdev: correct handling of memory allocation failure of evdev_client Aniroop Mathur <a.mathur@samsung.com> - 2016-01-25 18:50 +0100

csiph-web