From: Nathan Huff Date: Fri, 5 Feb 2016 20:35:07 +0000 (-0700) Subject: Fix ETIME handling for Solaris event ports. X-Git-Tag: samba-4.2.12~47 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c496c8549383384b2277cfe7d5f150ba0c5f80d5 Fix ETIME handling for Solaris event ports. It is possible for port_getn to return -1 with errno set to ETIME and still return events. If those events aren't processed the association is lost by samba since the kernel dissacociated them and samba never processed them so never reassociated them with the event port. The patch checks the nget return value in the case of ETIME and if it is non 0 it doesn't return and goes through the event processing loop. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11771 Signed-off-by: Nathan Huff Reviewed-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Sun Feb 7 11:26:35 CET 2016 on sn-devel-144 (cherry picked from commit 4953b1f73f8ec9387516be1058434d71937e1447) --- diff --git a/lib/tevent/tevent_port.c b/lib/tevent/tevent_port.c index 5b487d7341e..4b524dff291 100644 --- a/lib/tevent/tevent_port.c +++ b/lib/tevent/tevent_port.c @@ -496,10 +496,24 @@ static int port_event_loop(struct port_event_context *port_ev, struct timeval *t return 0; } - if (ret == -1 && port_errno == ETIME && tvalp) { - /* we don't care about a possible delay here */ - tevent_common_loop_timer_delay(ev); - return 0; + if (ret == -1 && port_errno == ETIME) { + /* + * If errno is set to ETIME it is possible that we still got an event. + * In that case we need to go through the processing loop so that we + * reassociate the received event with the port or the association will + * be lost so check the value of nget is 0 before returning. + */ + if (nget == 0) { + /* we don't care about a possible delay here */ + tevent_common_loop_timer_delay(ev); + return 0; + } + /* + * Set the return value to 0 since we do not actually have an error and we + * do have events that need to be processed. This keeps us from getting + * caught in the generic error test. + */ + ret = 0; } if (ret == -1) {