projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: zero-initialize fd_set
[lttng-tools.git]
/
tests
/
regression
/
kernel
/
select_poll_epoll.c
diff --git
a/tests/regression/kernel/select_poll_epoll.c
b/tests/regression/kernel/select_poll_epoll.c
index 3b98ab415c9c9485cf6c255d77c203ee5f0bcc4b..dfb52370bf761a050ca68ac64a8f88ae42411d1b 100644
(file)
--- a/
tests/regression/kernel/select_poll_epoll.c
+++ b/
tests/regression/kernel/select_poll_epoll.c
@@
-442,7
+442,7
@@
void ppoll_fds_ulong_max(void)
*/
void pselect_fd_too_big(void)
{
*/
void pselect_fd_too_big(void)
{
-
fd_set rfds
;
+
long rfds[2048 / (sizeof(long) * CHAR_BIT)] = { 0 }
;
int ret;
int fd2;
char buf[BUF_SIZE];
int ret;
int fd2;
char buf[BUF_SIZE];
@@
-456,9
+456,8
@@
void pselect_fd_too_big(void)
perror("dup2");
return;
}
perror("dup2");
return;
}
- FD_ZERO(&rfds);
- FD_SET(fd2, &rfds);
+ FD_SET(fd2, (fd_set *) &rfds);
ret = syscall(SYS_pselect6, fd2 + 1, &rfds, NULL, NULL, NULL, NULL);
if (ret == -1) {
ret = syscall(SYS_pselect6, fd2 + 1, &rfds, NULL, NULL, NULL, NULL);
if (ret == -1) {
@@
-723,17
+722,15
@@
void epoll_pwait_concurrent_munmap(void)
int ret, epollfd, i, fds[MAX_FDS];
char buf[BUF_SIZE];
struct epoll_event *epoll_event;
int ret, epollfd, i, fds[MAX_FDS];
char buf[BUF_SIZE];
struct epoll_event *epoll_event;
- void *addr = NULL;
pthread_t writer;
pthread_t writer;
-
epollfd = epoll_create(MAX_FDS);
if (epollfd < 0) {
perror("[eppoll] create");
goto end;
}
epollfd = epoll_create(MAX_FDS);
if (epollfd < 0) {
perror("[eppoll] create");
goto end;
}
- epoll_event = mmap(
addr
, MAX_FDS * sizeof(struct epoll_event),
+ epoll_event = mmap(
NULL
, MAX_FDS * sizeof(struct epoll_event),
PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0);
if (epoll_event == MAP_FAILED) {
PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0);
if (epoll_event == MAP_FAILED) {
@@
-790,7
+787,7
@@
end_unmap:
}
}
}
}
- ret = munmap(
addr
, MAX_FDS * sizeof(struct epoll_event));
+ ret = munmap(
epoll_event
, MAX_FDS * sizeof(struct epoll_event));
if (ret != 0) {
perror("munmap");
}
if (ret != 0) {
perror("munmap");
}
This page took
0.026665 seconds
and
5
git commands to generate.