Use correct ioctl request for termios
PATCH v3 1/1 Use correct ioctl request for termios
With the termios struct one is supposed to use TCGETS instead of TCGETA, see man ioctl_tty.
Related issue: https://github.com/linux-test-project/ltp/issues/637#issuecomment-1705334874
--- testcases/kernel/syscalls/ioctl/ioctl01.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
testcases/kernel/syscalls/ioctl/ioctl01.c +11 -11
@@ -37,23 +37,26 @@ static struct termios termios;static struct tcase {int *fd;int request; -struct termio *s_tio; -struct termios *s_tios; +void *s_tio;int error; } tcases[] = {/* file descriptor is invalid */ - {&bfd,TCGETA , &termio, &termios,EBADF }, + {&bfd,TCGETA , &termio,EBADF }, + {&bfd,TCGETS , &termios,EBADF },/* termio address is invalid */ - {&fd,TCGETA , (struct termio *)-1 , (struct termios *)-1 ,EFAULT }, -/* command is invalid */ + {&fd,TCGETA , (struct termio *)-1 ,EFAULT }, + {&fd,TCGETS , (struct termios *)-1 ,EFAULT }, +// /* command is invalid */ /* This errno value was changed from EINVAL to ENOTTY * by kernel commit 07d106d0 and bbb63c51 */ - {&fd,INVAL_IOCTL , &termio, &termios,ENOTTY }, + {&fd,INVAL_IOCTL , &termio,ENOTTY },/* file descriptor is for a regular file */ - {&fd_file,TCGETA , &termio, &termios,ENOTTY }, + {&fd_file,TCGETA , &termio,ENOTTY }, + {&fd_file,TCGETS , &termios,ENOTTY },/* termio is NULL */ - {&fd,TCGETA ,NULL ,NULL ,EFAULT } + {&fd,TCGETA ,NULL ,EFAULT }, + {&fd,TCGETS ,NULL ,EFAULT } };static char *device;
@@ -62,9 +65,6 @@ static void verify_ioctl(unsigned int i) {TST_EXP_FAIL (ioctl (*(tcases[i].fd), tcases[i].request, tcases[i].s_tio), tcases[i].error); - -TST_EXP_FAIL (ioctl (*(tcases[i].fd), tcases[i].request, tcases[i].s_tios), - tcases[i].error); }static void setup (void )
Signature · 5 lines
2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi,
Quoted 59 lines · Marius Kittler
With the termios struct one is supposed to use TCGETS instead of TCGETA, see
man ioctl_tty.Related issue: https://github.com/linux-test-project/ltp/issues/637#issuecomment-1705334874
Signed-off-by Marius Kittler <[email protected]>--- testcases/kernel/syscalls/ioctl/ioctl01.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)testcases/kernel/syscalls/ioctl/ioctl01.c +11
-11@@ -37,23 +37,26 @@ static struct termios termios;static struct tcase {int *fd;int request; -struct termio *s_tio; -struct termios *s_tios; +void *s_tio;int error; } tcases[] = {/* file descriptor is invalid */ - {&bfd,TCGETA , &termio, &termios,EBADF }, + {&bfd,TCGETA , &termio,EBADF }, + {&bfd,TCGETS , &termios,EBADF },/* termio address is invalid */ - {&fd,TCGETA , (struct termio *)-1 , (struct termios *)-1 ,EFAULT }, -/* command is invalid */ + {&fd,TCGETA , (struct termio *)-1 ,EFAULT }, + {&fd,TCGETS , (struct termios *)-1 ,EFAULT }, +// /* command is invalid */ /* This errno value was changed from EINVAL to ENOTTY * by kernel commit 07d106d0 and bbb63c51 */ - {&fd,INVAL_IOCTL , &termio, &termios,ENOTTY }, + {&fd,INVAL_IOCTL , &termio,ENOTTY },/* file descriptor is for a regular file */ - {&fd_file,TCGETA , &termio, &termios,ENOTTY }, + {&fd_file,TCGETA , &termio,ENOTTY }, + {&fd_file,TCGETS , &termios,ENOTTY },/* termio is NULL */ - {&fd,TCGETA ,NULL ,NULL ,EFAULT } + {&fd,TCGETA ,NULL ,EFAULT }, + {&fd,TCGETS ,NULL ,EFAULT } };static char *device;@@ -62,9 +65,6 @@ static void verify_ioctl(unsigned int i) {TST_EXP_FAIL (ioctl (*(tcases[i].fd), tcases[i].request, tcases[i].s_tio), tcases[i].error); - -TST_EXP_FAIL (ioctl (*(tcases[i].fd), tcases[i].request, tcases[i].s_tios), - tcases[i].error); }static void setup (void )
Signature · 11 lines
Martin Doucha [email protected] SW Quality Engineer SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Applied, thanks.
testcases/kernel/syscalls/ioctl/ioctl01.c static void verify_ioctl(unsigned int i) · line 67
Quoted 5 lines
static char *device;
testcases/kernel/syscalls/ioctl/ioctl01.c +0
-0@@ -62,9 +65,6 @@ static void verify_ioctl(unsigned int i) {TST_EXP_FAIL (ioctl (*(tcases[i].fd), tcases[i].request, tcases[i].s_tio), tcases[i].error);
It would be nice to also print a nice description here instead of the parameteres. The third parameter to the macro is a printf-like format string. What we usually do in these tests is to put short description of the testcase to the tcase structrure and print it here with TST_EXP_FAIL(... "%s", tcases[i].desc);
And another improvement would be to create a tty with openpty() and use the fd from these for the test instead of messing up with the system ttys. I suppose that we could drop the needs_root flag in that case as well.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp