hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session was assigned state SESSION_STATE_READY outside protected block, and backend dcb thread saw authentication data and session in SESSION_STATE_ALLOC state, which trapped. Moved state assignment inside protection block.

Browse Source
This commit is contained in:
vraatikka
2013-09-05 19:47:42 +03:00
parent 4f8057034a
commit 17ec98fa3d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/session.c
View File

@ -101,6 +101,9 @@ session_alloc(SERVICE *service, DCB *client)
session->data = client->data; session->data = client->data;
client->session = session; client->session = session;
session->refcount = 1; session->refcount = 1;
/** This indicates that session is ready to be shared with backend DCBs. */
session->state = SESSION_STATE_READY;
/** Release session lock */ /** Release session lock */
spinlock_release(&session->ses_lock); spinlock_release(&session->ses_lock);
@ -123,10 +126,6 @@ session_alloc(SERVICE *service, DCB *client)
session->next = allSessions; session->next = allSessions;
allSessions = session; allSessions = session;
spinlock_release(&session_spin); spinlock_release(&session_spin);
/** This indicates that session is ready to be shared with backend DCBs. */
session->state = SESSION_STATE_READY;
atomic_add(&service->stats.n_sessions, 1); atomic_add(&service->stats.n_sessions, 1);
atomic_add(&service->stats.n_current, 1); atomic_add(&service->stats.n_current, 1);
CHK_SESSION(session); CHK_SESSION(session);
@ -144,6 +143,9 @@ bool
session_link_dcb(SESSION *session, DCB *dcb) session_link_dcb(SESSION *session, DCB *dcb)
{ {
spinlock_acquire(&session->ses_lock); spinlock_acquire(&session->ses_lock);
ss_info_dassert(session->state != SESSION_STATE_FREE,
"If session->state is SESSION_STATE_FREE then this attempt to "
"access freed memory block.");
if (session->state == SESSION_STATE_FREE) if (session->state == SESSION_STATE_FREE)
{ {
spinlock_release(&session->ses_lock); spinlock_release(&session->ses_lock);