sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libmthread: don't free() user allocated stack space

Browse source
This commit is contained in:
Thomas Veerman 2012-02-10 09:16:00 +00:00
parent de89517711
commit 0949f5b342
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/libmthread/allocate.c
View file

@ -422,9 +422,10 @@ mthread_thread_t thread;
rt->m_arg = NULL; rt->m_arg = NULL;
rt->m_result = NULL; rt->m_result = NULL;
rt->m_cond = NULL; rt->m_cond = NULL;
if (rt->m_context.uc_stack.ss_sp) { if (rt->m_attr.ma_stackaddr == NULL) { /* We allocated stack space */
free(rt->m_context.uc_stack.ss_sp); /* Free allocated stack */ if (rt->m_context.uc_stack.ss_sp)
rt->m_context.uc_stack.ss_sp = NULL; free(rt->m_context.uc_stack.ss_sp); /* Free allocated stack */
rt->m_context.uc_stack.ss_sp = NULL;
} }
rt->m_context.uc_stack.ss_size = 0; rt->m_context.uc_stack.ss_size = 0;
rt->m_context.uc_link = NULL; rt->m_context.uc_link = NULL;

10
test/test59.c
View file

@ -633,9 +633,6 @@ PRIVATE void test_attributes(void)
if (stackaddr != newstackaddr) err(11, 14); if (stackaddr != newstackaddr) err(11, 14);
if (stacksize != newstacksize) err(11, 15); if (stacksize != newstacksize) err(11, 15);
if (mthread_attr_destroy(&tattr) != 0) err(11, 16); if (mthread_attr_destroy(&tattr) != 0) err(11, 16);
/* Freeing the stack. Note that this is only possible because it wasn't
* actually used yet by a thread. If it was, mthread would clean it up after
* usage and this free would do something undefined. */
free(newstackaddr); free(newstackaddr);
/* Try to allocate too small a stack; it should fail and the attribute /* Try to allocate too small a stack; it should fail and the attribute
@ -652,7 +649,6 @@ PRIVATE void test_attributes(void)
if (stackaddr == newstackaddr) err(11, 22); if (stackaddr == newstackaddr) err(11, 22);
if (stacksize == newstacksize) err(11, 23); if (stacksize == newstacksize) err(11, 23);
if (mthread_attr_destroy(&tattr) != 0) err(11, 24); if (mthread_attr_destroy(&tattr) != 0) err(11, 24);
/* Again, freeing because we can. Shouldn't do it if it was actually used. */
free(newstackaddr); free(newstackaddr);
/* Tell attribute to let the system allocate a stack for the thread and only /* Tell attribute to let the system allocate a stack for the thread and only
@ -742,9 +738,8 @@ PRIVATE void test_attributes(void)
if (mthread_mutex_unlock(condition_mutex) != 0) err(11, 65); if (mthread_mutex_unlock(condition_mutex) != 0) err(11, 65);
/* Verify stack hypothesis; we assume a stack is used from the top and grows /* Verify stack hypothesis; we assume a stack is used from the top and grows
* downwards. At this point the stack should still exist, because we haven't * downwards.
* 'joined' yet. After joining, the stack is cleaned up and this test becomes */
* useless. */
#if (_MINIX_CHIP == _CHIP_INTEL) #if (_MINIX_CHIP == _CHIP_INTEL)
if (stackp[0] != MAGIC) err(11, 66); /* End of the stack */ if (stackp[0] != MAGIC) err(11, 66); /* End of the stack */
for (i = no_ints - 1 - 16; i < no_ints; i++) for (i = no_ints - 1 - 16; i < no_ints; i++)
@ -760,6 +755,7 @@ PRIVATE void test_attributes(void)
if (mthread_attr_destroy(&tattr) != 0) err(11, 71); if (mthread_attr_destroy(&tattr) != 0) err(11, 71);
if (mthread_mutex_destroy(condition_mutex) != 0) err(11, 72); if (mthread_mutex_destroy(condition_mutex) != 0) err(11, 72);
if (mthread_cond_destroy(&condition) != 0) err(11, 73); if (mthread_cond_destroy(&condition) != 0) err(11, 73);
free(stackaddr);
#ifdef MDEBUG #ifdef MDEBUG
mthread_verify(); mthread_verify();