fix syncprov_qtask race, test062 crashes

[openldap] / servers / slapd / overlays / syncprov.c

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 72c9064ba35a9f15a5c40f31cc6d8cc5c5bbe501..1d960673452c27eb9b12c4130bb76d56f4f433cf 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -89,6 +89,7 @@ typedef struct syncops {
        int             s_inuse;        /* reference count */
        struct syncres *s_res;
        struct syncres *s_restail;
+       void *s_pool_cookie;
        ldap_pvt_thread_mutex_t s_mutex;
 } syncops;
 
@@ -794,20 +795,25 @@ static void free_resinfo( syncres *sr )
        }
 }
 
+#define FS_UNLINK      1
+#define FS_LOCK                2
+
 static int
-syncprov_free_syncop( syncops *so, int unlink )
+syncprov_free_syncop( syncops *so, int flags )
 {
        syncres *sr, *srnext;
        GroupAssertion *ga, *gnext;
 
-       ldap_pvt_thread_mutex_lock( &so->s_mutex );
+       if ( flags & FS_LOCK )
+               ldap_pvt_thread_mutex_lock( &so->s_mutex );
        /* already being freed, or still in use */
        if ( !so->s_inuse || --so->s_inuse > 0 ) {
-               ldap_pvt_thread_mutex_unlock( &so->s_mutex );
+               if ( flags & FS_LOCK )
+                       ldap_pvt_thread_mutex_unlock( &so->s_mutex );
                return 0;
        }
        ldap_pvt_thread_mutex_unlock( &so->s_mutex );
-       if ( unlink ) {
+       if (( flags & FS_UNLINK ) && so->s_si ) {
                syncops **sop;
                ldap_pvt_thread_mutex_lock( &so->s_si->si_ops_mutex );
                for ( sop = &so->s_si->si_ops; *sop; sop = &(*sop)->s_next ) {
@@ -962,11 +968,8 @@ syncprov_qplay( Operation *op, syncops *so )
 
        if ( rc == 0 && so->s_res ) {
                syncprov_qstart( so );
-       } else {
-               so->s_flags ^= PS_TASK_QUEUED;
        }
 
-       ldap_pvt_thread_mutex_unlock( &so->s_mutex );
        return rc;
 }
 
@@ -1002,8 +1005,17 @@ syncprov_qtask( void *ctx, void *arg )
 
        rc = syncprov_qplay( op, so );
 
+       /* if an error occurred, or no responses left, task is no longer queued */
+       if ( !rc && !so->s_res )
+               rc = 1;
+
        /* decrement use count... */
-       syncprov_free_syncop( so, 1 );
+       if ( !syncprov_free_syncop( so, FS_UNLINK )) {
+               if ( rc )
+                       /* if we didn't unlink, and task is no longer queued, clear flag */
+                       so->s_flags ^= PS_TASK_QUEUED;
+               ldap_pvt_thread_mutex_unlock( &so->s_mutex );
+       }
 
        return NULL;
 }
@@ -1014,8 +1026,8 @@ syncprov_qstart( syncops *so )
 {
        so->s_flags |= PS_TASK_QUEUED;
        so->s_inuse++;
-       ldap_pvt_thread_pool_submit( &connection_pool,
-               syncprov_qtask, so );
+       ldap_pvt_thread_pool_submit2( &connection_pool,
+               syncprov_qtask, so, &so->s_pool_cookie );
 }
 
 /* Queue a persistent search response */
@@ -1130,7 +1142,7 @@ syncprov_drop_psearch( syncops *so, int lock )
                if ( lock )
                        ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex );
        }
-       return syncprov_free_syncop( so, 0 );
+       return syncprov_free_syncop( so, FS_LOCK );
 }
 
 static int
@@ -1363,7 +1375,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                         * with saveit == TRUE
                         */
                        snext = ss->s_next;
-                       if ( syncprov_free_syncop( ss, 0 ) ) {
+                       if ( syncprov_free_syncop( ss, FS_LOCK ) ) {
                                *pss = snext;
                                gonext = 0;
                        }
@@ -1408,7 +1420,7 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
 
        for (sm = opc->smatches; sm; sm=snext) {
                snext = sm->sm_next;
-               syncprov_free_syncop( sm->sm_op, 1 );
+               syncprov_free_syncop( sm->sm_op, FS_LOCK|FS_UNLINK );
                op->o_tmpfree( sm, op->o_tmpmemctx );
        }
 
@@ -3253,7 +3265,10 @@ syncprov_db_close(
                        rs.sr_err = LDAP_UNAVAILABLE;
                        send_ldap_result( so->s_op, &rs );
                        sonext=so->s_next;
-                       syncprov_drop_psearch( so, 0);
+                       if ( so->s_flags & PS_TASK_QUEUED )
+                               ldap_pvt_thread_pool_retract( so->s_pool_cookie );
+                       if ( !syncprov_drop_psearch( so, 0 ))
+                               so->s_si = NULL;
                }
                si->si_ops=NULL;
                ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );