On Mon 15-01-24 13:53:50, Cyril Hrubis wrote:
> Signed-off-by: Cyril Hrubis <chrubis@xxxxxxx>
> Reviewed-by: Richard Palethorpe <rpalethorpe@xxxxxxxx>
Makes sense to me. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/accept/.gitignore | 1 +
> testcases/kernel/syscalls/accept/accept01.c | 8 ---
> testcases/kernel/syscalls/accept/accept03.c | 60 +++++++++++++++++++++
> 4 files changed, 62 insertions(+), 8 deletions(-)
> create mode 100644 testcases/kernel/syscalls/accept/accept03.c
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 8216d86b0..5472c954b 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -3,6 +3,7 @@ abort01 abort01
>
> accept01 accept01
> accept02 accept02
> +accept03 accept03
>
> accept4_01 accept4_01
>
> diff --git a/testcases/kernel/syscalls/accept/.gitignore b/testcases/kernel/syscalls/accept/.gitignore
> index 5b1462699..f81d4bec9 100644
> --- a/testcases/kernel/syscalls/accept/.gitignore
> +++ b/testcases/kernel/syscalls/accept/.gitignore
> @@ -1,2 +1,3 @@
> /accept01
> /accept02
> +/accept03
> diff --git a/testcases/kernel/syscalls/accept/accept01.c b/testcases/kernel/syscalls/accept/accept01.c
> index 85af0f8af..e5db1dfec 100644
> --- a/testcases/kernel/syscalls/accept/accept01.c
> +++ b/testcases/kernel/syscalls/accept/accept01.c
> @@ -26,7 +26,6 @@
> struct sockaddr_in sin0, sin1, fsin1;
>
> int invalid_socketfd = 400; /* anything that is not an open file */
> -int devnull_fd;
> int socket_fd;
> int udp_fd;
>
> @@ -45,10 +44,6 @@ static struct test_case {
> (struct sockaddr *)&fsin1, sizeof(fsin1), EBADF,
> "bad file descriptor"
> },
> - {
> - PF_INET, SOCK_STREAM, 0, &devnull_fd, (struct sockaddr *)&fsin1,
> - sizeof(fsin1), ENOTSOCK, "fd is not socket"
> - },
> {
> PF_INET, SOCK_STREAM, 0, &socket_fd, (struct sockaddr *)3,
> sizeof(fsin1), EINVAL, "invalid socket buffer"
> @@ -73,8 +68,6 @@ static void test_setup(void)
> sin0.sin_port = 0;
> sin0.sin_addr.s_addr = INADDR_ANY;
>
> - devnull_fd = SAFE_OPEN("/dev/null", O_WRONLY);
> -
> socket_fd = SAFE_SOCKET(PF_INET, SOCK_STREAM, 0);
> SAFE_BIND(socket_fd, (struct sockaddr *)&sin0, sizeof(sin0));
>
> @@ -88,7 +81,6 @@ static void test_setup(void)
>
> static void test_cleanup(void)
> {
> - SAFE_CLOSE(devnull_fd);
> SAFE_CLOSE(socket_fd);
> SAFE_CLOSE(udp_fd);
> }
> diff --git a/testcases/kernel/syscalls/accept/accept03.c b/testcases/kernel/syscalls/accept/accept03.c
> new file mode 100644
> index 000000000..b85ec0d9b
> --- /dev/null
> +++ b/testcases/kernel/syscalls/accept/accept03.c
> @@ -0,0 +1,60 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +
> +/*
> + * Copyright (C) 2023-2024 Cyril Hrubis <chrubis@xxxxxxx>
> + */
> +
> +/*\
> + * [Description]
> + *
> + * Verify that accept() returns ENOTSOCK or EBADF for non-socket file
> + * descriptors. The EBADF is returned in the case that the file descriptor has
> + * not a file associated with it, which is for example in the case of O_PATH
> + * opened file.
> + */
> +
> +#include <sys/socket.h>
> +#include <netinet/in.h>
> +
> +#include "tst_test.h"
> +
> +void check_accept(struct tst_fd *fd)
> +{
> + struct sockaddr_in addr = {
> + .sin_family = AF_INET,
> + .sin_port = 0,
> + .sin_addr = {.s_addr = INADDR_ANY},
> + };
> +
> + socklen_t size = sizeof(addr);
> +
> + int exp_errno = ENOTSOCK;
> +
> + switch (fd->type) {
> + case TST_FD_UNIX_SOCK:
> + case TST_FD_INET_SOCK:
> + return;
> + /*
> + * With these two we fail even before we get to the do_accept() because
> + * the fd does not have a struct file associated.
> + */
> + case TST_FD_OPEN_TREE:
> + case TST_FD_PATH:
> + exp_errno = EBADF;
> + default:
> + break;
> + }
> +
> + TST_EXP_FAIL2(accept(fd->fd, (void*)&addr, &size),
> + exp_errno, "accept() on %s", tst_fd_desc(fd));
> +}
> +
> +static void verify_accept(void)
> +{
> + TST_FD_FOREACH(fd)
> + check_accept(&fd);
> +}
> +
> +static struct tst_test test = {
> + .test_all = verify_accept,
> +};
> --
> 2.43.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
