mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 06:59:34 +00:00
Code Issues Releases Wiki Activity

If epoll_ctl fails, the descr->ev array isinconsistent

Browse Source 
Let's take an example:

fd = open(..) /* fd = 3 for example */

lxc_mainloop_add_handler(descr, fd, cb1, data1) fails.

the program take care of the error, it closes the fd

Later, reopen a fd (get 3 for again)

lxc_mainloop_add_handler(desc, fd, cb2, data2) is ok.

When something happen on fd, cb1 with data1 will be called instead of
cb2 with data2, because descr->ev contains 2 entries for fd == 3.

Signed-off-by: Clement Calmels <clement.calmels@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Clement Calmels
2010-01-13 18:51:16 +01:00
committed by Daniel Lezcano
parent 312b3ca262
commit 3ce45e6458
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lxc/mainloop.c
View File

@@ -81,7 +81,6 @@ int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
{ {
struct epoll_event *ev; struct epoll_event *ev;
struct mainloop_handler *handler; struct mainloop_handler *handler;
int ret = -1;
handler = malloc(sizeof(*handler)); handler = malloc(sizeof(*handler));
if (!handler) if (!handler)
@@ -95,25 +94,24 @@ int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
if (!ev) if (!ev)
goto out_free; goto out_free;
if (descr->nfds) { memcpy(ev, descr->ev, sizeof(*descr->ev) * (descr->nfds));
memcpy(ev, descr->ev, sizeof(*descr->ev) * (descr->nfds));
free(descr->ev); ev[descr->nfds].events = EPOLLIN;
ev[descr->nfds].data.ptr = handler;
if (epoll_ctl(descr->epfd, EPOLL_CTL_ADD, fd, &ev[descr->nfds]) < 0) {
free(ev);
goto out_free;
} }
free(descr->ev);
descr->ev = ev; descr->ev = ev;
descr->ev[descr->nfds].events = EPOLLIN;
descr->ev[descr->nfds].data.ptr = handler;
ret = epoll_ctl(descr->epfd, EPOLL_CTL_ADD, fd,
&descr->ev[descr->nfds]);
descr->nfds++; descr->nfds++;
out: return 0;
return ret;
out_free: out_free:
free(handler); free(handler);
goto out; return -1;
} }
int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd) int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd)