2020-01-12 00:48:14

by Haochen Tong

Subject: [PATCH] avctp: Fix EINVAL on uinput creation

The struct uinput_dev variable is on stack, so clear its content to
avoid accidentally writing garbage values to kernel. This fixes "Can't
create uinput device: Invalid argument (22)" in some cases.

Signed-off-by: Haochen Tong <[email protected]>
---
profiles/audio/avctp.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index d3b5dfab9..f7a3de211 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -1182,6 +1182,8 @@ static int uinput_create(struct btd_device *device, const char *name,
}
}

+ memset(&dev, 0, sizeof(struct uinput_dev));
+
if (name) {
strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE);
dev.name[UINPUT_MAX_NAME_SIZE - 1] = '\0';

base-commit: b4270d79e19ee70ccab6c087a7b470dad8a8a8bf
--
2.24.1

2020-01-14 01:37:50

by Luiz Augusto von Dentz

Subject: Re: [PATCH] avctp: Fix EINVAL on uinput creation

Hi,

On Sat, Jan 11, 2020 at 4:49 PM Haochen Tong <[email protected]> wrote:
>
> The struct uinput_dev variable is on stack, so clear its content to
> avoid accidentally writing garbage values to kernel. This fixes "Can't
> create uinput device: Invalid argument (22)" in some cases.
>
> Signed-off-by: Haochen Tong <[email protected]>

Ive the remove the line above since we don't use it for userspace
patches, see HACKING.

> ---
> profiles/audio/avctp.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
> index d3b5dfab9..f7a3de211 100644
> --- a/profiles/audio/avctp.c
> +++ b/profiles/audio/avctp.c
> @@ -1182,6 +1182,8 @@ static int uinput_create(struct btd_device *device, const char *name,
> }
> }
>
> + memset(&dev, 0, sizeof(struct uinput_dev));

Ive change the above like to use sizeof(dev)

> if (name) {
> strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE);
> dev.name[UINPUT_MAX_NAME_SIZE - 1] = '\0';
>
> base-commit: b4270d79e19ee70ccab6c087a7b470dad8a8a8bf
> --
> 2.24.1

Applied, thanks.

--
Luiz Augusto von Dentz