sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

poll should ignore invalid file descriptors

Browse Source
This commit is contained in:
Gregory Nutt 2013-05-23 07:02:44 -06:00
parent eb35cbf558
commit 16d04c7aa7
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4772,4 +4772,6 @@
correct usage of the socket API. Contributed by Max Holtzberg (2013-5-22). correct usage of the socket API. Contributed by Max Holtzberg (2013-5-22).
* configs/stm32ldiscovery/src/stm32_lcd.c: Framework for support of the * configs/stm32ldiscovery/src/stm32_lcd.c: Framework for support of the
STM32L-Discovery's segment LCD (2013-5-22). STM32L-Discovery's segment LCD (2013-5-22).
* fs/fs_poll.c: Poll setup/teardown logic should ignore invalid (i.e.,
negative) file descriptors. Max Holtzberg (2013-5-23).

64
fs/fs_poll.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* fs/fs_poll.c * fs/fs_poll.c
* *
* Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -140,6 +140,7 @@ static int poll_fdsetup(int fd, FAR struct pollfd *fds, bool setup)
ret = (int)inode->u.i_ops->poll(this_file, fds, setup); ret = (int)inode->u.i_ops->poll(this_file, fds, setup);
} }
return ret; return ret;
} }
#endif #endif
@ -162,20 +163,26 @@ static inline int poll_setup(FAR struct pollfd *fds, nfds_t nfds, sem_t *sem)
for (i = 0; i < nfds; i++) for (i = 0; i < nfds; i++)
{ {
/* Setup the poll descriptor */ /* Ignore negative descriptors */
fds[i].sem = sem; if (fds[i].fd >= 0)
fds[i].revents = 0;
fds[i].priv = NULL;
/* Set up the poll */
ret = poll_fdsetup(fds[i].fd, &fds[i], true);
if (ret < 0)
{ {
return ret; /* Setup the poll descriptor */
fds[i].sem = sem;
fds[i].revents = 0;
fds[i].priv = NULL;
/* Set up the poll */
ret = poll_fdsetup(fds[i].fd, &fds[i], true);
if (ret < 0)
{
return ret;
}
} }
} }
return OK; return OK;
} }
#endif #endif
@ -201,24 +208,29 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count)
*count = 0; *count = 0;
for (i = 0; i < nfds; i++) for (i = 0; i < nfds; i++)
{ {
/* Teardown the poll */ /* Ignore negative descriptors */
status = poll_fdsetup(fds[i].fd, &fds[i], false); if (fds[i].fd >= 0)
if (status < 0)
{ {
ret = status; /* Teardown the poll */
status = poll_fdsetup(fds[i].fd, &fds[i], false);
if (status < 0)
{
ret = status;
}
/* Check if any events were posted */
if (fds[i].revents != 0)
{
(*count)++;
}
/* Un-initialize the poll structure */
fds[i].sem = NULL;
} }
/* Check if any events were posted */
if (fds[i].revents != 0)
{
(*count)++;
}
/* Un-initialize the poll structure */
fds[i].sem = NULL;
} }
return ret; return ret;