[<prev] [next>] [day] [month] [year] [list]
Message-ID: <46CB6E7F.9080104@redhat.com>
Date: Tue, 21 Aug 2007 19:00:15 -0400
From: Chuck Ebbert <cebbert@...hat.com>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
CC: linux-kernel <linux-kernel@...r.kernel.org>
Subject: input: limit memory allocated by uinput ff drivers
input: limit memory allocated by uinput ff drivers
Don't let force feedback drivers allocate more than 256K of kernel
memory. On kernel 2.6.22 this causes a kernel OOPS with the SLUB
memory allocator; on later kernels the drivers may allocate large
amounts of memory.
Signed-off-by: Chuck Ebbert <cebbert@...hat.com>
---
drivers/input/ff-core.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- linux-2.6.22.noarch.orig/drivers/input/ff-core.c
+++ linux-2.6.22.noarch/drivers/input/ff-core.c
@@ -306,6 +306,7 @@ int input_ff_create(struct input_dev *de
{
struct ff_device *ff;
int i;
+ int needed_mem;
if (!max_effects) {
printk(KERN_ERR
@@ -313,8 +314,11 @@ int input_ff_create(struct input_dev *de
return -EINVAL;
}
- ff = kzalloc(sizeof(struct ff_device) +
- max_effects * sizeof(struct file *), GFP_KERNEL);
+ needed_mem = sizeof(struct ff_device) + max_effects * sizeof(struct file *);
+ if (needed_mem > 256 * 1024)
+ return -ENOMEM;
+
+ ff = kzalloc(needed_mem, GFP_KERNEL);
if (!ff)
return -ENOMEM;
-
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