diff options
| author | Stefano Garzarella <[email protected]> | 2025-07-15 09:32:33 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-07-16 23:14:00 +0000 |
| commit | 47ee43e4bf50be16a142df1bf51e04b4bc5a6cdc (patch) | |
| tree | 66eb27fe25b3b0ac19b4c3979e4d7bc9fda88fbc | |
| parent | tcp: fix UaF in tcp_prune_ofo_queue() (diff) | |
| download | kernel-47ee43e4bf50be16a142df1bf51e04b4bc5a6cdc.tar.gz kernel-47ee43e4bf50be16a142df1bf51e04b4bc5a6cdc.zip | |
vsock/test: fix vsock_ioctl_int() check for unsupported ioctl
`vsock_do_ioctl` returns -ENOIOCTLCMD if an ioctl support is not
implemented, like for SIOCINQ before commit f7c722659275 ("vsock: Add
support for SIOCINQ ioctl"). In net/socket.c, -ENOIOCTLCMD is re-mapped
to -ENOTTY for the user space. So, our test suite, without that commit
applied, is failing in this way:
34 - SOCK_STREAM ioctl(SIOCINQ) functionality...ioctl(21531): Inappropriate ioctl for device
Return false in vsock_ioctl_int() to skip the test in this case as well,
instead of failing.
Fixes: 53548d6bffac ("test/vsock: Add retry mechanism to ioctl wrapper")
Cc: [email protected]
Signed-off-by: Stefano Garzarella <[email protected]>
Reviewed-by: Xuewei Niu <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | tools/testing/vsock/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c index 1e65c5abd85b..7b861a8e997a 100644 --- a/tools/testing/vsock/util.c +++ b/tools/testing/vsock/util.c @@ -116,7 +116,7 @@ bool vsock_ioctl_int(int fd, unsigned long op, int expected) do { ret = ioctl(fd, op, &actual); if (ret < 0) { - if (errno == EOPNOTSUPP) + if (errno == EOPNOTSUPP || errno == ENOTTY) break; perror(name); |