All of lore.kernel.org
 help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org,
	David Herrmann <dh.herrmann@gmail.com>,
	Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: uinput - fix crash when mixing old and new init style
Date: Wed, 1 Feb 2017 09:49:25 +0100	[thread overview]
Message-ID: <20170201084925.GD31658@mail.corp.redhat.com> (raw)
In-Reply-To: <20170131231728.GA37933@dtor-ws>

On Jan 31 2017 or thereabouts, Dmitry Torokhov wrote:
> If user tries to initialize uinput device mixing old and new style
> initialization (i.e. using old UI_SET_ABSBIT instead of UI_ABS_SETUP,
> we forget to allocate input->absinfo and will crash when trying to send
> absolute events:
> 
>         ioctl(ui, UI_DEV_SETUP, &us);
>         ioctl(ui, UI_SET_EVBIT, EV_ABS);
>         ioctl(ui, UI_SET_ABSBIT, ABS_X);
>         ioctl(ui, UI_SET_ABSBIT, ABS_Y);
>         ioctl(ui, UI_DEV_CREATE, 0);

Shouldn't we prevent completely the mix of the 2 versions? If the user
used UI_DEV_SETUP, we should probably prevent the use of UI_SET_ABSBIT
afterwards, or at least warn it somehow.

But the patch in itself doesn't hurt, so:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Cheers,
Benjamin

> 
> Reported-by: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=191811
> Fixes: fbae10db0940 ("Input: uinput - rework ABS validation")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/misc/uinput.c | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> index 92595b98e7ed..022be0e22eba 100644
> --- a/drivers/input/misc/uinput.c
> +++ b/drivers/input/misc/uinput.c
> @@ -263,13 +263,21 @@ static int uinput_create_device(struct uinput_device *udev)
>  		return -EINVAL;
>  	}
>  
> -	if (test_bit(ABS_MT_SLOT, dev->absbit)) {
> -		nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
> -		error = input_mt_init_slots(dev, nslot, 0);
> -		if (error)
> +	if (test_bit(EV_ABS, dev->evbit)) {
> +		input_alloc_absinfo(dev);
> +		if (!dev->absinfo) {
> +			error = -EINVAL;
>  			goto fail1;
> -	} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
> -		input_set_events_per_packet(dev, 60);
> +		}
> +
> +		if (test_bit(ABS_MT_SLOT, dev->absbit)) {
> +			nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
> +			error = input_mt_init_slots(dev, nslot, 0);
> +			if (error)
> +				goto fail1;
> +		} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
> +			input_set_events_per_packet(dev, 60);
> +		}
>  	}
>  
>  	if (test_bit(EV_FF, dev->evbit) && !udev->ff_effects_max) {
> -- 
> 2.11.0.483.g087da7b7c-goog
> 
> -- 
> Dmitry

  reply	other threads:[~2017-02-01  8:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-31 23:17 [PATCH] Input: uinput - fix crash when mixing old and new init style Dmitry Torokhov
2017-02-01  8:49 ` Benjamin Tissoires [this message]
2017-02-01 17:27   ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170201084925.GD31658@mail.corp.redhat.com \
    --to=benjamin.tissoires@redhat.com \
    --cc=dh.herrmann@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rodrigorivascosta@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.