michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib: posix: Fix NULL pointer to strcmp in posix mqueue.

Browse source 
When a queue has been unlinked but not removed the name pointer is set to
NULL. The queue is still in the list when adding new queues and the name
pointer is passed to strcmp.

Signed-off-by: Jari Tervonen <jari.tervonen@nordicsemi.no>
This commit is contained in:
Jari Tervonen 2025-02-24 05:27:17 +00:00 • committed by Benjamin Cabé
commit 3b1e60da90
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/posix/options/mqueue.c
View file

@ -424,7 +424,7 @@ static mqueue_object *find_in_list(const char *name)
while (mq != NULL) { while (mq != NULL) {
msg_queue = (mqueue_object *)mq; msg_queue = (mqueue_object *)mq;
if (strcmp(msg_queue->name, name) == 0) { if ((msg_queue->name != NULL) && (strcmp(msg_queue->name, name) == 0)) {
return msg_queue; return msg_queue;
} }

26
tests/posix/xsi_realtime/src/mqueue.c
View file

@ -271,3 +271,29 @@ ZTEST(xsi_realtime, test_mqueue_notify_errors)
zassert_ok(mq_close(mqd), "Unable to close message queue descriptor."); zassert_ok(mq_close(mqd), "Unable to close message queue descriptor.");
zassert_ok(mq_unlink(queue), "Unable to unlink queue"); zassert_ok(mq_unlink(queue), "Unable to unlink queue");
} }
ZTEST(xsi_realtime, test_mqueue_open_and_unlink_multiple)
{
const char *q1 = "q1";
const char *q2 = "q2";
mqd_t mqd1, mqd2;
struct mq_attr attrs = {
.mq_msgsize = MESSAGE_SIZE,
.mq_maxmsg = MESG_COUNT_PERMQ,
};
int32_t mode = 0600;
int flags = O_RDWR | O_CREAT;
mqd1 = mq_open(q1, flags, mode, &attrs);
zassert_ok(mq_unlink(q1), "Unable to unlink q1");
mqd2 = mq_open(q2, flags, mode, &attrs);
zassert_ok(mq_unlink(q2), "Unable to unlink q2");
zassert_ok(mq_close(mqd1), "Unable to close message queue 1 descriptor.");
zassert_ok(mq_close(mqd2), "Unable to close message queue 2 descriptor.");
}