2012-07-31 12:48:24

by Andrzej Kaczmarek

Subject: [PATCH] input: Fix crash when connecting HID keyboard

hidp_add_connection should return after setting up security watch when
connecting HID keyboard, otherwise req will be freed and encrypt_notify
callback will receive invalid pointer.
---
profiles/input/device.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/profiles/input/device.c b/profiles/input/device.c
index ed178b4..48d397a 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -663,6 +663,8 @@ static int hidp_add_connection(const struct input_device *idev,
iconn->req = req;
iconn->sec_watch = g_io_add_watch(iconn->intr_io, G_IO_OUT,
encrypt_notify, iconn);
+
+ return 0;
}

err = ioctl_connadd(req);
--
1.7.11.3

2012-07-31 14:01:20

by Vinicius Costa Gomes

Subject: Re: [PATCH] input: Fix crash when connecting HID keyboard

Hi Andrzej,

On 14:48 Tue 31 Jul, Andrzej Kaczmarek wrote:
> hidp_add_connection should return after setting up security watch when
> connecting HID keyboard, otherwise req will be freed and encrypt_notify
> callback will receive invalid pointer.
> ---

Patch looks good. Ack.

[snip]


Cheers,
--
Vinicius

2012-08-13 10:29:07

by Johan Hedberg

Subject: Re: [PATCH] input: Fix crash when connecting HID keyboard

Hi Andrzej,

On Tue, Jul 31, 2012, Andrzej Kaczmarek wrote:
> hidp_add_connection should return after setting up security watch when
> connecting HID keyboard, otherwise req will be freed and encrypt_notify
> callback will receive invalid pointer.
> ---
> profiles/input/device.c | 2 ++
> 1 file changed, 2 insertions(+)

Applied. Thanks.

Johan