nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 12:08:36 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/epoll: add sanity check to handle invalid control option

Browse source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2020-12-23 10:41:13 +08:00 committed by Xiang Xiao
parent 39caf09df0
commit 0114f7c58f
1 changed files with 51 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
fs/vfs/fs_epoll.c
View file

@ -162,67 +162,78 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
*/
FAR struct epoll_head *eph = (FAR struct epoll_head *)((intptr_t)epfd);
int i;
switch (op)
{
case EPOLL_CTL_ADD:
finfo("%08x CTL ADD(%d): fd=%d ev=%08" PRIx32 "\n",
epfd, eph->occupied, fd, ev->events);
if (eph->occupied >= eph->size)
{
set_errno(ENOMEM);
return -1;
}
for (i = 0; i < eph->occupied; i++)
{
if (eph->poll[i].fd == fd)
{
set_errno(EEXIST);
return -1;
}
}
eph->data[eph->occupied] = ev->data;
eph->poll[eph->occupied].events = ev->events | POLLERR | POLLHUP;
eph->poll[eph->occupied++].fd = fd;
return 0;
break;
case EPOLL_CTL_DEL:
{
int i;
for (i = 0; i < eph->occupied; i++)
{
if (eph->poll[i].fd == fd)
{
if (i != eph->occupied - 1)
{
memmove(&eph->data[i], &eph->data[i + 1],
sizeof(epoll_data_t) * (eph->occupied - i));
memmove(&eph->poll[i], &eph->poll[i + 1],
sizeof(struct pollfd) * (eph->occupied - i));
}
for (i = 0; i < eph->occupied; i++)
{
if (eph->poll[i].fd == fd)
{
if (i != eph->occupied - 1)
{
memmove(&eph->data[i], &eph->data[i + 1],
sizeof(epoll_data_t) * (eph->occupied - i));
memmove(&eph->poll[i], &eph->poll[i + 1],
sizeof(struct pollfd) * (eph->occupied - i));
}
eph->occupied--;
break;
}
}
eph->occupied--;
return 0;
}
}
set_errno(ENOENT);
return -1;
}
set_errno(ENOENT);
return -1;
case EPOLL_CTL_MOD:
{
int i;
finfo("%08x CTL MOD(%d): fd=%d ev=%08" PRIx32 "\n",
epfd, eph->occupied, fd, ev->events);
finfo("%08x CTL MOD(%d): fd=%d ev=%08" PRIx32 "\n",
epfd, eph->occupied, fd, ev->events);
for (i = 0; i < eph->occupied; i++)
{
if (eph->poll[i].fd == fd)
{
eph->data[i] = ev->data;
eph->poll[i].events = ev->events | POLLERR | POLLHUP;
break;
}
}
for (i = 0; i < eph->occupied; i++)
{
if (eph->poll[i].fd == fd)
{
eph->data[i] = ev->data;
eph->poll[i].events = ev->events | POLLERR | POLLHUP;
return 0;
}
}
set_errno(ENOENT);
return -1;
set_errno(ENOENT);
return -1;
}
default:
set_errno(EINVAL);
return -1;
}
set_errno(EINVAL);
return -1;
return 0;
}
/****************************************************************************