2023-06-22 14:29:36

by Dana Elfassy

Subject: [PATCH v3] selftests/input: introduce a test for the EVIOCGKEY ioctl

This patch introduces a specific test case for the EVIOCGKEY ioctl.
The test covers the case where len > maxlen in the
EVIOCGKEY(sizeof(keystate)), keystate) ioctl.

Signed-off-by: Dana Elfassy <[email protected]>
---
Changes in v3:
- Edited commit's subject and description
- Renamed variable rep_values to keystate
- Added argument to selftest_uinput_create_device()
- Removed memset

Changes in v2:
- Added following note about the patch's dependency

This patch depends on '[v3] selftests/input: Introduce basic tests for evdev ioctls' [1] sent to the ML.
[1] https://patchwork.kernel.org/project/linux-input/patch/[email protected]/
tools/testing/selftests/input/evioc-test.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/tools/testing/selftests/input/evioc-test.c b/tools/testing/selftests/input/evioc-test.c
index ad7b93fe39cf..e0f69459f504 100644
--- a/tools/testing/selftests/input/evioc-test.c
+++ b/tools/testing/selftests/input/evioc-test.c
@@ -234,4 +234,21 @@ TEST(eviocsrep_set_repeat_settings)
selftest_uinput_destroy(uidev);
}

+TEST(eviocgkey_get_global_key_state)
+{
+ struct selftest_uinput *uidev;
+ int keystate = 0;
+ int rc;
+
+ rc = selftest_uinput_create_device(&uidev, -1);
+ ASSERT_EQ(0, rc);
+ ASSERT_NE(NULL, uidev);
+
+ /* ioctl to create the scenario where len > maxlen in bits_to_user() */
+ rc = ioctl(uidev->evdev_fd, EVIOCGKEY(0), keystate);
+ ASSERT_EQ(0, rc);
+
+ selftest_uinput_destroy(uidev);
+}
+
TEST_HARNESS_MAIN
--
2.41.0

2023-06-22 16:09:11

by Enric Balletbo Serra

Subject: Re: [PATCH v3] selftests/input: introduce a test for the EVIOCGKEY ioctl

Hi Dana,

Thanks for applying the changes.

Missatge de Dana Elfassy <[email protected]> del dia dj., 22 de juny
2023 a les 16:18:

>
> This patch introduces a specific test case for the EVIOCGKEY ioctl.
> The test covers the case where len > maxlen in the
> EVIOCGKEY(sizeof(keystate)), keystate) ioctl.
>
> Signed-off-by: Dana Elfassy <[email protected]>
> ---
> Changes in v3:
> - Edited commit's subject and description
> - Renamed variable rep_values to keystate
> - Added argument to selftest_uinput_create_device()
> - Removed memset
>
> Changes in v2:
> - Added following note about the patch's dependency
>
> This patch depends on '[v3] selftests/input: Introduce basic tests for evdev ioctls' [1] sent to the ML.
> [1] https://patchwork.kernel.org/project/linux-input/patch/[email protected]/
> tools/testing/selftests/input/evioc-test.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/tools/testing/selftests/input/evioc-test.c b/tools/testing/selftests/input/evioc-test.c
> index ad7b93fe39cf..e0f69459f504 100644
> --- a/tools/testing/selftests/input/evioc-test.c
> +++ b/tools/testing/selftests/input/evioc-test.c
> @@ -234,4 +234,21 @@ TEST(eviocsrep_set_repeat_settings)
> selftest_uinput_destroy(uidev);
> }
>
> +TEST(eviocgkey_get_global_key_state)
> +{
> + struct selftest_uinput *uidev;
> + int keystate = 0;
> + int rc;
> +
> + rc = selftest_uinput_create_device(&uidev, -1);
> + ASSERT_EQ(0, rc);
> + ASSERT_NE(NULL, uidev);
> +
> + /* ioctl to create the scenario where len > maxlen in bits_to_user() */
> + rc = ioctl(uidev->evdev_fd, EVIOCGKEY(0), keystate);
> + ASSERT_EQ(0, rc);

So if I understand correctly this is only to trigger the following
code path (line 709 and 710) which is not covered by other input
tests.

1154 1 : case EVIOCGKEY(0):
1155 1 : return
evdev_handle_get_val(client, dev, EV_KEY, dev->key,
1156 :
KEY_MAX, size, p, compat_mode);
1157 :

886 1 : static int evdev_handle_get_val(struct
evdev_client *client,
...
909 :
910 1 : ret = bits_to_user(mem, maxbit, maxlen,
p, compat);


702 1 : static int bits_to_user(unsigned long *bits,
unsigned int maxbit,
...
709 1 : if (len > maxlen)
710 1 : len = maxlen;

> +
> + selftest_uinput_destroy(uidev);
> +}
> +
> TEST_HARNESS_MAIN
> --
> 2.41.0
>

I ran the test with code coverage enabled and I can confirm the code
path is triggered, running libevdev tests plus this test increases the
code coverage for the EVIOCGKEY ioctl. so

Reviewed-by: Enric Balletbo i Serra <[email protected]>

Thanks,
Enric