From 129da06d2d9c9d1cedc5e4de492744b29adc1684 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 11 Feb 2013 10:38:01 -0800 Subject: tevent: Ensure we return after every call to epoll_panic(). Currently we can't return from this, but the new fallback code will change this. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- lib/tevent/tevent_epoll.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/tevent/tevent_epoll.c') diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c index 5f93de2c578..8e7bc4d26b1 100644 --- a/lib/tevent/tevent_epoll.c +++ b/lib/tevent/tevent_epoll.c @@ -152,6 +152,7 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_ event.data.ptr = fde; if (epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_ADD, fde->fd, &event) != 0) { epoll_panic(epoll_ev, "EPOLL_CTL_ADD failed"); + return; } fde->additional_flags |= EPOLL_ADDITIONAL_FD_FLAG_HAS_EVENT; @@ -201,6 +202,7 @@ static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct tevent_ event.data.ptr = fde; if (epoll_ctl(epoll_ev->epoll_fd, EPOLL_CTL_MOD, fde->fd, &event) != 0) { epoll_panic(epoll_ev, "EPOLL_CTL_MOD failed"); + return; } /* only if we want to read we want to tell the event handler about errors */ -- cgit v1.2.1