Port setsockopt01 to the new API
PATCH v2 1/1 Port setsockopt01 to the new API
Signed-off-by Martin Doucha <[email protected]>
---
Changes since v1:
- Use SAFE_CLOSE() instead of close() in EBADF testcase setup
- Improve setsockopt() result checks
.../kernel/syscalls/setsockopt/setsockopt01.c | 243 +++++------------- 1 file changed, 69 insertions(+), 174 deletions(-)
testcases/kernel/syscalls/setsockopt/setsockopt01.c +69 -174
@@ -1,72 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* 07/2001 John George +* Copyright (c) 2020 Martin Doucha <[email protected]> */ /* -* Test Name: setsockopt01 -* * Test Description: * Verify that setsockopt() returns the proper errno for various failure cases -* -* Usage: <for command-line> -* setsockopt01 [-c n] [-e] [-i n] [-I x] [-p x] [-t] -* where, -c n : Run n copies concurrently. -* -e : Turn on errno logging. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -t : Turn on syscall timing. -* -* History -* 07/2001 John George -* -Ported -* -* Restrictions: -* None. -* */ -#include <stdio.h> #include <unistd.h> -#include <errno.h> -#include <fcntl.h> -#include <sys/types.h> #include <sys/socket.h> -#include <sys/signal.h> #include <sys/ioctl.h> -#include <netinet/in.h> -#include "test.h" -#include "safe_macros.h" +#include "tst_test.h" -char *TCID ="setsockopt01" ; -int testno; +static struct sockaddr_in addr; +static int optval; -int s;/* socket descriptor */ -struct sockaddr_in sin0, fsin1; -int optval; - -void setup (void ),setup0 (void ),setup1 (void ), -cleanup (void ),cleanup0 (void ),cleanup1 (void ); - -struct test_case_t {/* test case structure */ +static struct test_case { /* test case structure */ int domain; /* PF_INET, PF_UNIX, ... */ int type; /* SOCK_STREAM, SOCK_DGRAM ... */ int proto; /* protocol number (usually 0 = default) */
@@ -74,140 +29,80 @@ struct test_case_t { /* test case structure */int optname;void *optval;int optlen; -struct sockaddr *sin; -int salen; -int retval;/* syscall return value */ int experrno;/* expected errno */ -void (*setup) (void ); -void (*cleanup) (void );char *desc; -} tdat[] = { - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, EBADF, setup0, cleanup0, - "bad file descriptor"} - , { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOTSOCK, setup0, cleanup0, - "bad file descriptor"} - , -#if !defined(UCLINUX) - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, 0, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, EFAULT, setup1, cleanup1, - "invalid option buffer"} - , -#endif - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, 0, - (struct sockaddr *)&fsin1, sizeof(fsin1), -1, - EINVAL, setup1, cleanup1, "invalid optlen"} - , { - PF_INET, SOCK_STREAM, 0, 500, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid level"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_UDP, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (UDP)"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_IP, -1, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (IP)"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_TCP, -1, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (TCP)"} -,}; - -int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); - -int main(int argc, char *argv[]) +} testcase_list[] = { + {-1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval), + EBADF, "invalid file descriptor"}, + {-1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval), + ENOTSOCK, "non-socket file descriptor"}, + {PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, NULL, + sizeof(optval), EFAULT, "invalid option buffer"}, + {PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, 0, + EINVAL, "invalid optlen"}, + {PF_INET, SOCK_STREAM, 0, 500, SO_OOBINLINE, &optval, sizeof(optval), + ENOPROTOOPT, "invalid level"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_UDP, SO_OOBINLINE, &optval, + sizeof(optval), ENOPROTOOPT, "invalid option name (UDP)"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_IP, -1, &optval, sizeof(optval), + ENOPROTOOPT, "invalid option name (IP)"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_TCP, -1, &optval, sizeof(optval), + ENOPROTOOPT, "invalid option name (TCP)"} +}; + +static void setup(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - for (lc = 0; TEST_LOOPING(lc); ++lc) { - tst_count = 0; - for (testno = 0; testno < TST_TOTAL; ++testno) { - tdat[testno].setup(); - - TEST(setsockopt(s, tdat[testno].level, - tdat[testno].optname, - tdat[testno].optval, - tdat[testno].optlen)); - - if (TEST_RETURN == -1) { - } - - if (TEST_RETURN != tdat[testno].retval || - (TEST_RETURN < 0 && - TEST_ERRNO != tdat[testno].experrno)) { - tst_resm(TFAIL, "%s ; returned" - " %ld (expected %d), errno %d (expected" - " %d)", tdat[testno].desc, - TEST_RETURN, tdat[testno].retval, - TEST_ERRNO, tdat[testno].experrno); - } else { - tst_resm(TPASS, "%s successful", - tdat[testno].desc); - } - tdat[testno].cleanup(); - } - } - cleanup(); - tst_exit(); + /* initialize local sockaddr */ + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = INADDR_ANY; } -void setup(void) +static void run(unsigned int n) { + struct test_case *tc = testcase_list + n; + int tmpfd, fd; - tst_sig(NOFORK, DEF_HANDLER, cleanup); + tst_res(TINFO, "Testing %s", tc->desc); - TEST_PAUSE; + if (tc->domain == -1) { + tmpfd = fd = SAFE_OPEN("/dev/null", O_WRONLY); + } else { + tmpfd = fd = SAFE_SOCKET(tc->domain, tc->type, tc->proto); + SAFE_BIND(fd, (struct sockaddr *)&addr, sizeof(addr)); + } - /* initialize local sockaddr */ - sin0.sin_family = AF_INET; - sin0.sin_port = 0; - sin0.sin_addr.s_addr = INADDR_ANY; -} + /* Use closed file descriptor rather than -1 */ + if (tc->experrno == EBADF) + SAFE_CLOSE(tmpfd); -void cleanup(void) -{ -} + TEST(setsockopt(fd, tc->level, tc->optname, tc->optval, tc->optlen)); -void setup0(void) -{ - if (tdat[testno].experrno == EBADF) - s = 400; /* anything not an open file */ - else if ((s = open("/dev/null", O_WRONLY)) == -1) - tst_brkm(TBROK, cleanup, "error opening /dev/null - " - "errno: %s", strerror(errno)); -} + if (tc->experrno != EBADF) + SAFE_CLOSE(fd); -void cleanup0(void) -{ - s = -1; -} + if (TST_RET == 0) { + tst_res(TFAIL, "setsockopt() succeeded unexpectedly"); + return; + } -void setup1(void) -{ - s = SAFE_SOCKET(cleanup, tdat[testno].domain, tdat[testno].type, - tdat[testno].proto); - SAFE_BIND(cleanup, s, (struct sockaddr *)&sin0, sizeof(sin0)); -} + if (TST_RET != -1) { + tst_res(TFAIL | TTERRNO, + "Invalid setsockopt() return value %ld", TST_RET); + return; + } -void cleanup1(void) -{ - (void)close(s); - s = -1; + if (TST_ERR != tc->experrno) { + tst_res(TFAIL | TTERRNO, + "setsockopt() returned unexpected error"); + return; + } + + tst_res(TPASS | TTERRNO, "setsockopt() returned the expected error"); } + +static struct tst_test test = { + .test = run, + .tcnt = ARRAY_SIZE(testcase_list), + .setup = setup +};
Signature · 1 line
2.26.2
PATCH v2 1/1 Port setsockopt01 to the new API
HI Martin
Looks good to me,
Reviewed-by Yang Xu <[email protected]>
Quoted 298 lines
Signed-off-by Martin Doucha <[email protected]>---
Changes since v1:
- UseSAFE_CLOSE()instead ofclose()in EBADF testcase setup
- Improvesetsockopt()result checks.../kernel/syscalls/setsockopt/setsockopt01.c | 243 +++++------------- 1 file changed, 69 insertions(+), 174 deletions(-)testcases/kernel/syscalls/setsockopt/setsockopt01.c +69
-174@@ -1,72 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* 07/2001 John George +* Copyright (c) 2020 Martin Doucha <[email protected]> */ /* -* Test Name: setsockopt01 -* * Test Description: * Verify that setsockopt() returns the proper errno for various failure cases -* -* Usage: <for command-line> -* setsockopt01 [-c n] [-e] [-i n] [-I x] [-p x] [-t] -* where, -c n : Run n copies concurrently. -* -e : Turn on errno logging. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -t : Turn on syscall timing. -* -* History -* 07/2001 John George -* -Ported -* -* Restrictions: -* None. -* */ -#include <stdio.h> #include <unistd.h> -#include <errno.h> -#include <fcntl.h> -#include <sys/types.h> #include <sys/socket.h> -#include <sys/signal.h> #include <sys/ioctl.h> -#include <netinet/in.h> -#include "test.h" -#include "safe_macros.h" +#include "tst_test.h" -char *TCID ="setsockopt01" ; -int testno; +static struct sockaddr_in addr; +static int optval; -int s;/* socket descriptor */ -struct sockaddr_in sin0, fsin1; -int optval; - -void setup (void ),setup0 (void ),setup1 (void ), -cleanup (void ),cleanup0 (void ),cleanup1 (void ); - -struct test_case_t {/* test case structure */ +static struct test_case { /* test case structure */ int domain; /* PF_INET, PF_UNIX, ... */ int type; /* SOCK_STREAM, SOCK_DGRAM ... */ int proto; /* protocol number (usually 0 = default) */@@ -74,140 +29,80 @@ struct test_case_t { /* test case structure */int optname;void *optval;int optlen; -struct sockaddr *sin; -int salen; -int retval;/* syscall return value */ int experrno;/* expected errno */ -void (*setup) (void ); -void (*cleanup) (void );char *desc; -} tdat[] = { - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, EBADF, setup0, cleanup0, - "bad file descriptor"} - , { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOTSOCK, setup0, cleanup0, - "bad file descriptor"} - , -#if !defined(UCLINUX) - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, 0, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, EFAULT, setup1, cleanup1, - "invalid option buffer"} - , -#endif - { - PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, 0, - (struct sockaddr *)&fsin1, sizeof(fsin1), -1, - EINVAL, setup1, cleanup1, "invalid optlen"} - , { - PF_INET, SOCK_STREAM, 0, 500, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid level"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_UDP, SO_OOBINLINE, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (UDP)"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_IP, -1, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (IP)"} - , { - PF_INET, SOCK_STREAM, 0, IPPROTO_TCP, -1, &optval, - sizeof(optval), (struct sockaddr *)&fsin1, - sizeof(fsin1), -1, ENOPROTOOPT, setup1, cleanup1, - "invalid option name (TCP)"} -,}; - -int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); - -int main(int argc, char *argv[]) +} testcase_list[] = { + {-1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval), + EBADF, "invalid file descriptor"}, + {-1, -1, -1, SOL_SOCKET, SO_OOBINLINE, &optval, sizeof(optval), + ENOTSOCK, "non-socket file descriptor"}, + {PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, NULL, + sizeof(optval), EFAULT, "invalid option buffer"}, + {PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, 0, + EINVAL, "invalid optlen"}, + {PF_INET, SOCK_STREAM, 0, 500, SO_OOBINLINE, &optval, sizeof(optval), + ENOPROTOOPT, "invalid level"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_UDP, SO_OOBINLINE, &optval, + sizeof(optval), ENOPROTOOPT, "invalid option name (UDP)"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_IP, -1, &optval, sizeof(optval), + ENOPROTOOPT, "invalid option name (IP)"}, + {PF_INET, SOCK_STREAM, 0, IPPROTO_TCP, -1, &optval, sizeof(optval), + ENOPROTOOPT, "invalid option name (TCP)"} +}; + +static void setup(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - for (lc = 0; TEST_LOOPING(lc); ++lc) { - tst_count = 0; - for (testno = 0; testno < TST_TOTAL; ++testno) { - tdat[testno].setup(); - - TEST(setsockopt(s, tdat[testno].level, - tdat[testno].optname, - tdat[testno].optval, - tdat[testno].optlen)); - - if (TEST_RETURN == -1) { - } - - if (TEST_RETURN != tdat[testno].retval || - (TEST_RETURN < 0 && - TEST_ERRNO != tdat[testno].experrno)) { - tst_resm(TFAIL, "%s ; returned" - " %ld (expected %d), errno %d (expected" - " %d)", tdat[testno].desc, - TEST_RETURN, tdat[testno].retval, - TEST_ERRNO, tdat[testno].experrno); - } else { - tst_resm(TPASS, "%s successful", - tdat[testno].desc); - } - tdat[testno].cleanup(); - } - } - cleanup(); - tst_exit(); + /* initialize local sockaddr */ + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = INADDR_ANY; } -void setup(void) +static void run(unsigned int n) { + struct test_case *tc = testcase_list + n; + int tmpfd, fd; - tst_sig(NOFORK, DEF_HANDLER, cleanup); + tst_res(TINFO, "Testing %s", tc->desc); - TEST_PAUSE; + if (tc->domain == -1) { + tmpfd = fd = SAFE_OPEN("/dev/null", O_WRONLY); + } else { + tmpfd = fd = SAFE_SOCKET(tc->domain, tc->type, tc->proto); + SAFE_BIND(fd, (struct sockaddr *)&addr, sizeof(addr)); + } - /* initialize local sockaddr */ - sin0.sin_family = AF_INET; - sin0.sin_port = 0; - sin0.sin_addr.s_addr = INADDR_ANY; -} + /* Use closed file descriptor rather than -1 */ + if (tc->experrno == EBADF) + SAFE_CLOSE(tmpfd); -void cleanup(void) -{ -} + TEST(setsockopt(fd, tc->level, tc->optname, tc->optval, tc->optlen)); -void setup0(void) -{ - if (tdat[testno].experrno == EBADF) - s = 400; /* anything not an open file */ - else if ((s = open("/dev/null", O_WRONLY)) == -1) - tst_brkm(TBROK, cleanup, "error opening /dev/null - " - "errno: %s", strerror(errno)); -} + if (tc->experrno != EBADF) + SAFE_CLOSE(fd); -void cleanup0(void) -{ - s = -1; -} + if (TST_RET == 0) { + tst_res(TFAIL, "setsockopt() succeeded unexpectedly"); + return; + } -void setup1(void) -{ - s = SAFE_SOCKET(cleanup, tdat[testno].domain, tdat[testno].type, - tdat[testno].proto); - SAFE_BIND(cleanup, s, (struct sockaddr *)&sin0, sizeof(sin0)); -} + if (TST_RET != -1) { + tst_res(TFAIL | TTERRNO, + "Invalid setsockopt() return value %ld", TST_RET); + return; + } -void cleanup1(void) -{ - (void)close(s); - s = -1; + if (TST_ERR != tc->experrno) { + tst_res(TFAIL | TTERRNO, + "setsockopt() returned unexpected error"); + return; + } + + tst_res(TPASS | TTERRNO, "setsockopt() returned the expected error"); } + +static struct tst_test test = { + .test = run, + .tcnt = ARRAY_SIZE(testcase_list), + .setup = setup +};
PATCH v2 1/1 Port setsockopt01 to the new API
Hi Martin,
Quoted 2 lines
Looks good to me,
Reviewed-by Yang Xu <[email protected]>
Thanks, pushed!
Kind regards,
Petr