summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2019-10-07 10:48:23 -0500
committerJoel Sherrill <joel@rtems.org>2020-01-17 16:13:35 -0600
commit5e7b3c6533aae1bedce65c1b2dfc28a34cfe8161 (patch)
tree995a5d0b5a81e43a9759b3f75c89aa9744694a4d
parent362cf319d44e7e64987f12aa36ea030e6298c586 (diff)
downloadrtems-5e7b3c6533aae1bedce65c1b2dfc28a34cfe8161.tar.bz2
posix_devctl - Add support for SOCKCLOSE
The FACE Technical Standard, Edition 3.0 and later require the definition of the subcommand SOCKCLOSE in <devctl.h>. Reference: ​https://www.opengroup.org/face closes #3856.
Diffstat (limited to '')
-rw-r--r--cpukit/libcsupport/src/posix_devctl.c16
-rw-r--r--testsuites/psxtests/psxdevctl01/main.c2
-rw-r--r--testsuites/psxtests/psxdevctl01/psxdevctl01.doc8
-rw-r--r--testsuites/psxtests/psxdevctl01/psxdevctl01.scn4
-rw-r--r--testsuites/psxtests/psxdevctl01/test.c26
5 files changed, 53 insertions, 3 deletions
diff --git a/cpukit/libcsupport/src/posix_devctl.c b/cpukit/libcsupport/src/posix_devctl.c
index 415b94e278..0646ee4356 100644
--- a/cpukit/libcsupport/src/posix_devctl.c
+++ b/cpukit/libcsupport/src/posix_devctl.c
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2016 Joel Sherrill <joel@rtems.org>. All rights reserved.
+ * Copyright (c) 2016, 2020 Joel Sherrill <joel@rtems.org>.
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +34,8 @@
#include <sys/ioctl.h>
#include <rtems/seterr.h>
+#include <unistd.h>
+
int posix_devctl(
int fd,
int dcmd,
@@ -68,5 +71,16 @@ int posix_devctl(
*dev_info_ptr = 0;
}
+ /*
+ * The FACE Technical Standard Edition 3.0 and newer requires the SOCKCLOSE
+ * ioctl command. This is because the Security Profile does not include
+ * close() and applications need a way to close sockets. Closing sockets is
+ * a minimum requirement so using close() in the implementation meets that
+ * requirement but also lets the application close other file types.
+ */
+ if (dcmd == SOCKCLOSE ) {
+ return close(fd);
+ }
+
return ioctl(fd, dcmd, dev_data_ptr);
}
diff --git a/testsuites/psxtests/psxdevctl01/main.c b/testsuites/psxtests/psxdevctl01/main.c
index d74fb6b102..54776e2b24 100644
--- a/testsuites/psxtests/psxdevctl01/main.c
+++ b/testsuites/psxtests/psxdevctl01/main.c
@@ -39,6 +39,8 @@ rtems_task Init(
#define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_MAXIMUM_FILE_DESCRIPTORS 4
+
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/psxtests/psxdevctl01/psxdevctl01.doc b/testsuites/psxtests/psxdevctl01/psxdevctl01.doc
index fee22d237d..51f295d2f1 100644
--- a/testsuites/psxtests/psxdevctl01/psxdevctl01.doc
+++ b/testsuites/psxtests/psxdevctl01/psxdevctl01.doc
@@ -19,5 +19,11 @@ concepts:
+ Ensure that proper error values result when passing different combinations of
arguments to posix_devctl().
-+ Ensure that a requestn is passed through the underlying ioctl() operation
++ Ensure that a request is passed through the underlying ioctl() operation
to the console device driver and flagged as an error.
+
++ Ensure that the SOCKCLOSE subcommand is supported by posix_devctl()
+ and returns an error on invalid file descriptors.
+
++ Ensure that the SOCKCLOSE subcommand is supported by posix_devctl()
+ and will close a file descriptor.
diff --git a/testsuites/psxtests/psxdevctl01/psxdevctl01.scn b/testsuites/psxtests/psxdevctl01/psxdevctl01.scn
index 1df1d7e6e8..440046300d 100644
--- a/testsuites/psxtests/psxdevctl01/psxdevctl01.scn
+++ b/testsuites/psxtests/psxdevctl01/psxdevctl01.scn
@@ -1,4 +1,6 @@
*** BEGIN OF TEST PSXDEVCTL 1 ***
posix_devctl() FIONBIO on stdin return dev_info -- EBADF
-posix_devctl() FIONBIO on stdin return dev_info -- EBADF
+posix_devctl() FIONBIO on stdin NULL dev_info -- EBADF
+posix_devctl() SOCKCLOSE on invalid file descriptor -- EBADF
+posix_devctl() SOCKCLOSE on valid file descriptor -- OK
*** END OF TEST PSXDEVCTL 1 ***
diff --git a/testsuites/psxtests/psxdevctl01/test.c b/testsuites/psxtests/psxdevctl01/test.c
index ed22ba8410..b45725cb58 100644
--- a/testsuites/psxtests/psxdevctl01/test.c
+++ b/testsuites/psxtests/psxdevctl01/test.c
@@ -76,6 +76,32 @@ int main(
rtems_test_assert( status == -1 );
rtems_test_assert( errno == EBADF );
+ puts( "posix_devctl() SOCKCLOSE on invalid file descriptor -- EBADF" );
+ fd = 21;
+ dcmd = SOCKCLOSE;
+ dev_data_ptr = NULL;
+ nbyte = 0;
+ status = posix_devctl( fd, dcmd, dev_data_ptr, nbyte, NULL );
+ rtems_test_assert( status == -1 );
+ rtems_test_assert( errno == EBADF );
+
+ /*
+ * Create a file, open it, and close it via posix_devctl().
+ * Then verify it is really closed.
+ */
+ puts( "posix_devctl() SOCKCLOSE on valid file descriptor -- OK" );
+ fd = open("tmp_for_close", O_CREAT | O_RDWR, S_IRWXU );
+ rtems_test_assert( fd != -1 );
+
+ dcmd = SOCKCLOSE;
+ dev_data_ptr = NULL;
+ nbyte = 0;
+ status = posix_devctl( fd, dcmd, dev_data_ptr, nbyte, NULL );
+ rtems_test_assert( status == 0 );
+
+ status = close( fd );
+ rtems_test_assert( status == -1 );
+ rtems_test_assert( errno == EBADF );
TEST_END();
exit(0);
}