[LTP] [PATCH v3] Use correct ioctl request for termios
Marius Kittler
mkittler@suse.de
Thu Sep 7 16:21:40 CEST 2023
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 <mkittler@suse.de>
---
testcases/kernel/syscalls/ioctl/ioctl01.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/testcases/kernel/syscalls/ioctl/ioctl01.c b/testcases/kernel/syscalls/ioctl/ioctl01.c
index 1be38e79d..3ca8a9a3b 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl01.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl01.c
@@ -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)
--
2.42.0
More information about the ltp
mailing list