2021-11-07 11:25:43

by Ajay Garg

[permalink] [raw]
Subject: [PATCH v3] tty: vt: keyboard: add default switch-case, to handle smatch-warnings in method vt_do_kdgkb_ioctl

smatch-kchecker gives the following warnings when run on keyboard.c :

vt_do_kdgkb_ioctl() error: uninitialized symbol 'kbs'.
vt_do_kdgkb_ioctl() error: uninitialized symbol 'ret'.

This usually happens when switch has no default case and static
analyzers and even sometimes compilers can’t prove that all possible
values are covered.


Thus, the default switch-case has been added, which sets the values
for the two variables :

* kbs as NULL, which also nicely fits in with kfree.

* ret as -ENOIOCTLCMD (on same lines if there is no cmd
match in "vt_do_kdskled" method).


Many thanks to the following for review of previous versions :

* Pavel Skripkin <[email protected]>
* Andy Shevchenko <[email protected]>


Signed-off-by: Ajay Garg <[email protected]>
---


There were discussions previously, and the current patch is the
result.

v1 :
https://lore.kernel.org/linux-serial/[email protected]/T/#t

v2 :
https://lore.kernel.org/linux-serial/CAHP4M8Vdj4Eb8q773BeHvsW9n6t=3n1WznuXAR4fZCNi1J6rOg@mail.gmail.com/T/#m18f45676feaba6b1f01ddd5fe607997b190ef4b9

Changes in v2 :

* Changes as required by scripts/checkpatch.pl

* Checking whether kbs is not NULL before kfree is not required,
as kfree(NULL) is safe. So, dropped the check.

Changes in v3 :

* Using default-switch case, and setting the variables
when there is no matching cmd.


drivers/tty/vt/keyboard.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index c7fbbcdcc346..b83e7669658d 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -2090,6 +2090,12 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)

ret = 0;
break;
+ default: {
+ kbs = NULL;
+ ret = -ENOIOCTLCMD;
+
+ break;
+ }
}

kfree(kbs);
--
2.30.2


2021-11-07 11:26:11

by Pavel Skripkin

[permalink] [raw]
Subject: Re: [PATCH v3] tty: vt: keyboard: add default switch-case, to handle smatch-warnings in method vt_do_kdgkb_ioctl

On 11/7/21 01:03, Ajay Garg wrote:
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index c7fbbcdcc346..b83e7669658d 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
> @@ -2090,6 +2090,12 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
>
> ret = 0;
> break;
> + default: {
> + kbs = NULL;
> + ret = -ENOIOCTLCMD;
> +
> + break;
> + }

Are these brackets needed here? There are no local variables inside
default case.


just my 2c,

With regards,
Pavel Skripkin

2021-11-07 11:26:14

by Ajay Garg

[permalink] [raw]
Subject: Re: [PATCH v3] tty: vt: keyboard: add default switch-case, to handle smatch-warnings in method vt_do_kdgkb_ioctl

On Sun, Nov 7, 2021 at 3:42 AM Pavel Skripkin <[email protected]> wrote:
>
> On 11/7/21 01:03, Ajay Garg wrote:
> > diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> > index c7fbbcdcc346..b83e7669658d 100644
> > --- a/drivers/tty/vt/keyboard.c
> > +++ b/drivers/tty/vt/keyboard.c
> > @@ -2090,6 +2090,12 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
> >
> > ret = 0;
> > break;
> > + default: {
> > + kbs = NULL;
> > + ret = -ENOIOCTLCMD;
> > +
> > + break;
> > + }
>
> Are these brackets needed here? There are no local variables inside
> default case.

Hmm,

* case KDGKBSENT: uses braces.
* case KDSKBSENT: does not use braces.

I based the layout for default-case on the same lines as case
KDGKBSENT: , as I prefer explicit braces :)

2021-11-07 11:26:21

by Pavel Skripkin

[permalink] [raw]
Subject: Re: [PATCH v3] tty: vt: keyboard: add default switch-case, to handle smatch-warnings in method vt_do_kdgkb_ioctl

On 11/7/21 01:17, Ajay Garg wrote:
> On Sun, Nov 7, 2021 at 3:42 AM Pavel Skripkin <[email protected]> wrote:
>>
>> On 11/7/21 01:03, Ajay Garg wrote:
>> > diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
>> > index c7fbbcdcc346..b83e7669658d 100644
>> > --- a/drivers/tty/vt/keyboard.c
>> > +++ b/drivers/tty/vt/keyboard.c
>> > @@ -2090,6 +2090,12 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
>> >
>> > ret = 0;
>> > break;
>> > + default: {
>> > + kbs = NULL;
>> > + ret = -ENOIOCTLCMD;
>> > +
>> > + break;
>> > + }
>>
>> Are these brackets needed here? There are no local variables inside
>> default case.
>
> Hmm,
>
> * case KDGKBSENT: uses braces.
> * case KDSKBSENT: does not use braces.
>
> I based the layout for default-case on the same lines as case
> KDGKBSENT: , as I prefer explicit braces :)
>

I am not against these braces, but I, honestly, dislike them, because
`case : {` syntax looks ugly _to me_.

KDGKBSENT uses it because of local variable `len` and not using them
will cause build error.

I didn't find any strict requirements to not use brackets when there is
no local variable, so it's up to maintainers (again).


Anyway, thank for respinning :)



With regards,
Pavel Skripkin

2021-11-07 14:11:38

by Ajay Garg

[permalink] [raw]
Subject: Re: [PATCH v3] tty: vt: keyboard: add default switch-case, to handle smatch-warnings in method vt_do_kdgkb_ioctl

> >
>
> I am not against these braces, but I, honestly, dislike them, because
> `case : {` syntax looks ugly _to me_.
>
> KDGKBSENT uses it because of local variable `len` and not using them
> will cause build error.

Ahh, that explains the difference.

Floated the v4 patch at :
https://lore.kernel.org/linux-serial/[email protected]/T/#u

so that consistency is maintained in the styling.

Let's continue on the v4-patch link now.

Thanks again Pavel.


>
> I didn't find any strict requirements to not use brackets when there is
> no local variable, so it's up to maintainers (again).
>
>
> Anyway, thank for respinning :)
>
>
>
> With regards,
> Pavel Skripkin