Re: [PATCH] tty: vt/keyboard: Hoist and reuse variable in vt_do_kdgkb_ioctl

[Jiri Slaby]

On 26. 02. 26, 13:34, Thorsten Blum wrote:
> Hoist 'len' and use it in both cases.
>
> The last 'kbs' assignment is useless and a leftover from commit
> bfb24564b5fd ("tty: vt/keyboard: use __free()"). Remove it.

No, kbs is set to NULL by vt_kdskbsent() when it should NOT be freed.

> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
> ---
>   drivers/tty/vt/keyboard.c | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index d65fc60dd7be..6a1044f87216 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
...
> @@ -2022,12 +2023,12 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
>   			return -EPERM;
>   
>   		char __free(kfree) *kbs = strndup_user(user_kdgkb->kb_string,
> -						       sizeof(user_kdgkb->kb_string));
> +						       len);
>   		if (IS_ERR(kbs))
>   			return PTR_ERR(kbs);
>   
>   		guard(spinlock_irqsave)(&func_buf_lock);
> -		kbs = vt_kdskbsent(kbs, kb_func);
> +		vt_kdskbsent(kbs, kb_func);



--
js
suse labs