adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

posix: pthread: ensure pthread_key_delete() removes correct key

Browse source 
Previously, `pthread_key_delete()` was only ever deleting key 0
rather than the key corresponding to the provided argument.

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
This commit is contained in:
Christopher Friedt 2023-11-23 11:42:50 -05:00 committed by Chris Friedt
parent e3f5c96667
commit a89fa32dac
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/posix/key.c
View file

@ -10,6 +10,7 @@
#include <zephyr/posix/pthread.h> #include <zephyr/posix/pthread.h>
#include <zephyr/posix/pthread_key.h> #include <zephyr/posix/pthread_key.h>
#include <zephyr/sys/bitarray.h> #include <zephyr/sys/bitarray.h>
#include <zephyr/sys/__assert.h>
struct pthread_key_data { struct pthread_key_data {
sys_snode_t node; sys_snode_t node;
@ -120,6 +121,8 @@ int pthread_key_create(pthread_key_t *key,
*/ */
int pthread_key_delete(pthread_key_t key) int pthread_key_delete(pthread_key_t key)
{ {
size_t bit;
__unused int ret;
pthread_key_obj *key_obj; pthread_key_obj *key_obj;
struct pthread_key_data *key_data; struct pthread_key_data *key_data;
sys_snode_t *node_l, *next_node_l; sys_snode_t *node_l, *next_node_l;
@ -145,7 +148,9 @@ int pthread_key_delete(pthread_key_t key)
k_free((void *)key_data); k_free((void *)key_data);
} }
(void)sys_bitarray_free(&posix_key_bitarray, 1, 0); bit = posix_key_to_offset(key_obj);
ret = sys_bitarray_free(&posix_key_bitarray, 1, bit);
__ASSERT_NO_MSG(ret == 0);
k_spin_unlock(&pthread_key_lock, key_key); k_spin_unlock(&pthread_key_lock, key_key);