This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4f57ebce66adda3a6904ec098f76117821923497
Author: dongjiuzhu1 <dongjiuz...@xiaomi.com>
AuthorDate: Wed Mar 26 11:57:00 2025 +0800
fs/poll: remove poll_fdsetup
Allow users to operate poll in the kernel using the file_poll
approach, as file is protected with reference counting,
making it more secure.
Signed-off-by: dongjiuzhu1 <dongjiuz...@xiaomi.com>
---
fs/vfs/fs_poll.c | 77 +++++++++++++++++++++++++--------------------------
include/nuttx/fs/fs.h | 5 ++--
include/sys/poll.h | 1 -
3 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index f309c655e9..f53f560981 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -79,8 +79,24 @@ static inline void poll_teardown(FAR struct pollfd *fds,
nfds_t nfds,
{
if (fds[i].fd >= 0)
{
- int status = poll_fdsetup(fds[i].fd, &fds[i], false);
- if (status < 0)
+ FAR struct file *filep;
+ int ret;
+
+ ret = fs_getfilep(fds[i].fd, &filep);
+ if (ret >= 0)
+ {
+ ret = file_poll(filep, &fds[i], false);
+
+ /* Calling putfilep twice to ensure reference counting
+ * for filep remains consistent with its state for
+ * before the poll.
+ */
+
+ fs_putfilep(filep);
+ fs_putfilep(filep);
+ }
+
+ if (ret < 0)
{
fds[i].revents |= POLLERR;
}
@@ -144,10 +160,26 @@ static inline int poll_setup(FAR struct pollfd *fds,
nfds_t nfds,
if (fds[i].fd >= 0)
{
- ret = poll_fdsetup(fds[i].fd, &fds[i], true);
+ FAR struct file *filep;
+ int num = i;
+
+ ret = fs_getfilep(fds[i].fd, &filep);
+ if (ret < 0)
+ {
+ num -= 1;
+ }
+ else
+ {
+ ret = file_poll(filep, &fds[i], true);
+ }
+
if (ret < 0)
{
- poll_teardown(fds, i, &count);
+ if (num >= 0)
+ {
+ poll_teardown(fds, num, &count);
+ }
+
fds[i].revents |= POLLERR;
fds[i].arg = NULL;
fds[i].cb = NULL;
@@ -192,38 +224,6 @@ static void poll_cleanup(FAR void *arg)
* Public Functions
****************************************************************************/
-/****************************************************************************
- * Name: poll_fdsetup
- *
- * Description:
- * Configure (or unconfigure) one file/socket descriptor for the poll
- * operation. If fds and sem are non-null, then the poll is being setup.
- * if fds and sem are NULL, then the poll is being torn down.
- *
- ****************************************************************************/
-
-int poll_fdsetup(int fd, FAR struct pollfd *fds, bool setup)
-{
- FAR struct file *filep;
- int ret;
-
- /* Get the file pointer corresponding to this file descriptor */
-
- ret = fs_getfilep(fd, &filep);
- if (ret < 0)
- {
- return ret;
- }
-
- DEBUGASSERT(filep != NULL);
-
- /* Let file_poll() do the rest */
-
- ret = file_poll(filep, fds, setup);
- fs_putfilep(filep);
- return ret;
-}
-
/****************************************************************************
* Name: poll_default_cb
*
@@ -309,9 +309,8 @@ void poll_notify(FAR struct pollfd **afds, int nfds,
pollevent_t eventset)
* Name: file_poll
*
* Description:
- * Low-level poll operation based on struct file. This is used both to (1)
- * support detached file, and also (2) by poll_fdsetup() to perform all
- * normal operations on file descriptors.
+ * Low-level poll operation based on struct file. This is used to
+ * support detached file.
*
* Input Parameters:
* file File structure instance
diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
index 156d67279a..4e73f8b2c9 100644
--- a/include/nuttx/fs/fs.h
+++ b/include/nuttx/fs/fs.h
@@ -1676,9 +1676,8 @@ int file_fcntl(FAR struct file *filep, int cmd, ...);
* Name: file_poll
*
* Description:
- * Low-level poll operation based on struct file. This is used both to (1)
- * support detached file, and also (2) by poll_fdsetup() to perform all
- * normal operations on file descriptors.
+ * Low-level poll operation based on struct file. This is used to
+ * support detached file.
*
* Input Parameters:
* file File structure instance
diff --git a/include/sys/poll.h b/include/sys/poll.h
index 23690e8c13..4188ead31a 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -154,7 +154,6 @@ int ppoll(FAR struct pollfd *fds, nfds_t nfds,
FAR const struct timespec *timeout_ts,
FAR const sigset_t *sigmask);
-int poll_fdsetup(int fd, FAR struct pollfd *fds, bool setup);
void poll_default_cb(FAR struct pollfd *fds);
void poll_notify(FAR struct pollfd **afds, int nfds, pollevent_t eventset);
