Skip to content

Commit

Permalink
Input: force feedback - potential integer wrap in input_ff_create()
Browse files Browse the repository at this point in the history
The problem here is that max_effects can wrap on 32 bits systems.
We'd allocate a smaller amount of data than sizeof(struct ff_device).
The call to kcalloc() on the next line would fail but it would write
the NULL return outside of the memory we just allocated causing data
corruption.

The call path is that uinput_setup_device() get ->ff_effects_max from
the user and sets the value in the ->private_data struct.  From there
it is:
-> uinput_ioctl_handler()
   -> uinput_create_device()
      -> input_ff_create(dev, udev->ff_effects_max);

I've also changed ff_effects_max so it's an unsigned int instead of
a signed int as a cleanup.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dan Carpenter authored and Dmitry Torokhov committed Oct 13, 2011
1 parent 341deef commit 05be8b8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions drivers/input/ff-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,23 @@ EXPORT_SYMBOL_GPL(input_ff_event);
* Once ff device is created you need to setup its upload, erase,
* playback and other handlers before registering input device
*/
int input_ff_create(struct input_dev *dev, int max_effects)
int input_ff_create(struct input_dev *dev, unsigned int max_effects)
{
struct ff_device *ff;
size_t ff_dev_size;
int i;

if (!max_effects) {
pr_err("cannot allocate device without any effects\n");
return -EINVAL;
}

ff = kzalloc(sizeof(struct ff_device) +
max_effects * sizeof(struct file *), GFP_KERNEL);
ff_dev_size = sizeof(struct ff_device) +
max_effects * sizeof(struct file *);
if (ff_dev_size < max_effects) /* overflow */
return -EINVAL;

ff = kzalloc(ff_dev_size, GFP_KERNEL);
if (!ff)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion include/linux/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ struct ff_device {
struct file *effect_owners[];
};

int input_ff_create(struct input_dev *dev, int max_effects);
int input_ff_create(struct input_dev *dev, unsigned int max_effects);
void input_ff_destroy(struct input_dev *dev);

int input_ff_event(struct input_dev *dev, unsigned int type, unsigned int code, int value);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/uinput.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct uinput_device {
unsigned char head;
unsigned char tail;
struct input_event buff[UINPUT_BUFFER_SIZE];
int ff_effects_max;
unsigned int ff_effects_max;

struct uinput_request *requests[UINPUT_NUM_REQUESTS];
wait_queue_head_t requests_waitq;
Expand Down

0 comments on commit 05be8b8

Please sign in to comment.