sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TLS: Correct handling of returned error values.

Browse Source 
I not two problems in handling of the return error values in PR #3858:

1. In KERNEL mode, the error return value of _SEM_WAIT() will be a negated errno value; in all other modes, it will be -1 (ERROR) with the errno variable set.  This must be handled in the test of the returned value:  Don't compare with -1; rather check if < 0
2. Also, conversion of the returned value to a negated errno value must be handled differently.  This is handled by replacing -get_errno() with the macro _ERRVAL(ret)

This effects only error handling (it fixes it) and no other impacts are expected.
This commit is contained in:
Gregory Nutt 2021-06-07 15:12:15 -06:00 committed by Gustavo Henrique Nihei
parent 3859031a6b
commit 9aaeaefa41
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/libc/tls/tls_alloc.c
View File

@ -66,10 +66,9 @@ int tls_alloc(void)
*/
ret = _SEM_WAIT(&tinfo->ta_tlssem);
if (ERROR == ret)
if (ret < 0)
{
ret = -get_errno();
ret = _SEM_ERRVAL(ret);
goto errout_with_errno;
}

2
libs/libc/tls/tls_free.c
View File

@ -79,7 +79,7 @@ int tls_free(int tlsindex)
}
else
{
ret = -get_errno();
ret = _SEM_ERRVAL(ret);
}
}