mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

For ITS#6104: Protect initial o_abandon/o_cancel with op->o_conn->c_mutex.

Browse Source
This commit is contained in:
Hallvard Furuseth 2009-05-21 23:22:46 +00:00
parent 23a726395f
commit acba4f7755
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
servers/slapd/abandon.c
View File

@ -36,6 +36,7 @@ do_abandon( Operation *op, SlapReply *rs )
{ {
ber_int_t id; ber_int_t id;
Operation *o; Operation *o;
const char *msg;
Debug( LDAP_DEBUG_TRACE, "%s do_abandon\n", Debug( LDAP_DEBUG_TRACE, "%s do_abandon\n",
op->o_log_prefix, 0, 0 ); op->o_log_prefix, 0, 0 );
@ -72,28 +73,21 @@ do_abandon( Operation *op, SlapReply *rs )
} }
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
/*
* find the operation being abandoned and set the o_abandon
* flag. It's up to the backend to periodically check this
* flag and abort the operation at a convenient time.
*/
/* Find the operation being abandoned. */
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) { LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
if ( o->o_msgid == id ) { if ( o->o_msgid == id ) {
o->o_abandon = 1;
break; break;
} }
} }
if ( o ) { if ( o == NULL ) {
op->orn_msgid = id; msg = "not found";
/* The operation is not active. Just discard it if found. */
op->o_bd = frontendDB;
rs->sr_err = frontendDB->be_abandon( op, rs );
} else {
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) { LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
if ( o->o_msgid == id ) { if ( o->o_msgid == id ) {
msg = "discarded";
/* FIXME: This traverses c_pending_ops yet again. */
LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops,
o, Operation, o_next ); o, Operation, o_next );
LDAP_STAILQ_NEXT(o, o_next) = NULL; LDAP_STAILQ_NEXT(o, o_next) = NULL;
@ -102,13 +96,24 @@ do_abandon( Operation *op, SlapReply *rs )
break; break;
} }
} }
} else {
msg = "found";
/* Set the o_abandon flag in the to-be-abandoned operation.
* The backend can periodically check this flag and abort the
* operation at a convenient time. However it should "send"
* the response anyway, with result code SLAPD_ABANDON.
* The functions in result.c will intercept the message.
*/
o->o_abandon = 1;
op->orn_msgid = id;
op->o_bd = frontendDB;
rs->sr_err = frontendDB->be_abandon( op, rs );
} }
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
Debug( LDAP_DEBUG_TRACE, "%s do_abandon: op=%ld %sfound\n", Debug( LDAP_DEBUG_TRACE, "%s do_abandon: op=%ld %s\n",
op->o_log_prefix, op->o_log_prefix, (long) id, msg );
(long) id, o ? "" : "not " );
return rs->sr_err; return rs->sr_err;
} }

22
servers/slapd/cancel.c
View File

@ -65,6 +65,7 @@ int cancel_extop( Operation *op, SlapReply *rs )
} }
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) { LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
if ( o->o_msgid == opid ) { if ( o->o_msgid == opid ) {
LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next ); LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next );
@ -78,21 +79,25 @@ int cancel_extop( Operation *op, SlapReply *rs )
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) { LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
if ( o->o_msgid == opid ) { if ( o->o_msgid == opid ) {
o->o_abandon = 1;
break; break;
} }
} }
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); if ( o == NULL ) {
rc = LDAP_NO_SUCH_OPERATION;
if ( o ) { rs->sr_text = "message ID not found";
if ( o->o_cancel != SLAP_CANCEL_NONE ) { } else if ( o->o_cancel != SLAP_CANCEL_NONE ) {
rc = LDAP_PROTOCOL_ERROR;
rs->sr_text = "message ID already being cancelled"; rs->sr_text = "message ID already being cancelled";
return LDAP_PROTOCOL_ERROR; } else {
rc = LDAP_SUCCESS;
o->o_cancel = SLAP_CANCEL_REQ;
o->o_abandon = 1;
} }
o->o_cancel = SLAP_CANCEL_REQ; ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
if ( rc == LDAP_SUCCESS ) {
LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) { LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
if( !op->o_bd->be_cancel ) continue; if( !op->o_bd->be_cancel ) continue;
@ -113,9 +118,6 @@ int cancel_extop( Operation *op, SlapReply *rs )
} }
o->o_cancel = SLAP_CANCEL_DONE; o->o_cancel = SLAP_CANCEL_DONE;
} else {
rs->sr_text = "message ID not found";
rc = LDAP_NO_SUCH_OPERATION;
} }
return rc; return rc;