From 93be26e4516b6692d6f16b69c592150fe4d1b52e Mon Sep 17 00:00:00 2001 From: ritesh55555 Date: Wed, 11 Dec 2024 02:01:23 +0530 Subject: [PATCH] fs/mqueue/mq_check.c: group level error check for mq operations - This commit creates an api mq_check() for mqueue module. This api will check the mq descriptor value in the mq des list of the calling task's group. This will help to remove unwanted error in mq_send and mq_receive apis. --- os/fs/mqueue/Make.defs | 2 +- os/fs/mqueue/mq_check.c | 108 ++++++++++++++++++++++++++++++++++ os/fs/mqueue/mq_close.c | 12 +--- os/include/mqueue.h | 7 +++ os/kernel/mqueue/mq_getattr.c | 4 ++ os/kernel/mqueue/mq_notify.c | 5 ++ os/kernel/mqueue/mq_receive.c | 6 ++ os/kernel/mqueue/mq_send.c | 9 ++- os/kernel/mqueue/mq_setattr.c | 4 ++ 9 files changed, 144 insertions(+), 13 deletions(-) create mode 100644 os/fs/mqueue/mq_check.c diff --git a/os/fs/mqueue/Make.defs b/os/fs/mqueue/Make.defs index 6ec8bd9d4e..e796af2d32 100644 --- a/os/fs/mqueue/Make.defs +++ b/os/fs/mqueue/Make.defs @@ -54,7 +54,7 @@ ifneq ($(CONFIG_DISABLE_MQUEUE),y) -CSRCS += mq_open.c mq_close.c mq_unlink.c +CSRCS += mq_open.c mq_close.c mq_unlink.c mq_check.c # Include POSIX message queue build support diff --git a/os/fs/mqueue/mq_check.c b/os/fs/mqueue/mq_check.c new file mode 100644 index 0000000000..5564e613b3 --- /dev/null +++ b/os/fs/mqueue/mq_check.c @@ -0,0 +1,108 @@ +/**************************************************************************** + * + * Copyright 2024 Samsung Electronics All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ +/************************************************************************ + * fs/mqueue/mq_check.c + * + * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************/ + +/************************************************************************ + * Included Files + ************************************************************************/ + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +/************************************************************************ + * Public Functions + ************************************************************************/ + +/************************************************************************ + * Name: mq_check + * + * Description: + * This function checks if a message queue descriptor is present in the + * calling task's group list of mq des. + * + * Parameters: + * mqdes - Message queue descriptor + * + * Return Value: + * OK - if mqdes is present in the calling task group list of mqdes + * ERROR - if mqdes is not present in the calling task group of mqdes + * + ************************************************************************/ + +int mq_check(mqd_t mqdes) +{ + int ret = -EBADF; + mqd_t mqdes_ptr; + + FAR struct task_group_s *group = sched_self()->group; + + sched_lock(); + mqdes_ptr = (mqd_t)sq_peek(&group->tg_msgdesq); + while (mqdes_ptr) { + if (mqdes_ptr == mqdes) { + ret = OK; + break; + } + mqdes_ptr = (mqd_t)sq_next(mqdes_ptr); + } + sched_unlock(); + + return ret; +} diff --git a/os/fs/mqueue/mq_close.c b/os/fs/mqueue/mq_close.c index e5136ce06a..c0792ca292 100644 --- a/os/fs/mqueue/mq_close.c +++ b/os/fs/mqueue/mq_close.c @@ -96,7 +96,6 @@ int mq_close_group(mqd_t mqdes, FAR struct task_group_s *group) int ret = OK; FAR struct mqueue_inode_s *msgq; FAR struct inode *inode; - mqd_t mqdes_ptr; DEBUGASSERT(mqdes != NULL && group != NULL); @@ -105,17 +104,8 @@ int mq_close_group(mqd_t mqdes, FAR struct task_group_s *group) if (mqdes) { sched_lock(); - /* Check that mqdes is in one's group */ - mqdes_ptr = (mqd_t)sq_peek(&group->tg_msgdesq); - while (mqdes_ptr) { - if (mqdes_ptr == mqdes) { - break; - } - mqdes_ptr = (mqd_t)sq_next(mqdes_ptr); - } - /* If there is no mqdes in one's group, skip to desclose and inode release. */ - if (mqdes_ptr != NULL) { + if (mq_check(mqdes) == OK) { /* Find the message queue associated with the message descriptor */ diff --git a/os/include/mqueue.h b/os/include/mqueue.h index e0c90c84a3..66cac4cf32 100644 --- a/os/include/mqueue.h +++ b/os/include/mqueue.h @@ -188,6 +188,13 @@ int mq_setattr(mqd_t mqdes, FAR const struct mq_attr *mq_stat, FAR struct mq_att * @since TizenRT v1.0 */ int mq_getattr(mqd_t mqdes, FAR struct mq_attr *mq_stat); +/** + * @brief get message queue attributes + * @details @b #include \n + * POSIX API (refer to : http://pubs.opengroup.org/onlinepubs/9699919799/) + * @since TizenRT v1.0 + */ +int mq_check(mqd_t mqdes); #undef EXTERN #ifdef __cplusplus diff --git a/os/kernel/mqueue/mq_getattr.c b/os/kernel/mqueue/mq_getattr.c index 7983d19bef..ae3e6da3ff 100644 --- a/os/kernel/mqueue/mq_getattr.c +++ b/os/kernel/mqueue/mq_getattr.c @@ -105,6 +105,10 @@ int mq_getattr(mqd_t mqdes, struct mq_attr *mq_stat) { int ret = ERROR; + if (mq_check(mqdes) != OK) { + return ERROR; + } + if (mqdes && mq_stat) { /* Return the attributes */ diff --git a/os/kernel/mqueue/mq_notify.c b/os/kernel/mqueue/mq_notify.c index 99784b9084..bda1a9972c 100644 --- a/os/kernel/mqueue/mq_notify.c +++ b/os/kernel/mqueue/mq_notify.c @@ -161,6 +161,11 @@ int mq_notify(mqd_t mqdes, const struct sigevent *notification) return ERROR; } + if (mq_check(mqdes) != OK) { + set_errno(EBADF); + return ERROR; + } + /* Get a pointer to the message queue */ msgq = mqdes->msgq; diff --git a/os/kernel/mqueue/mq_receive.c b/os/kernel/mqueue/mq_receive.c index ba90355871..2c48377250 100644 --- a/os/kernel/mqueue/mq_receive.c +++ b/os/kernel/mqueue/mq_receive.c @@ -145,6 +145,12 @@ ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen, FAR int *prio) /* mq_receive() is a cancellation point */ (void)enter_cancellation_point(); + if (mq_check(mqdes) != OK) { + leave_cancellation_point(); + set_errno(EINVAL); + return ERROR; + } + if (mq_verifyreceive(mqdes, msg, msglen) != OK) { leave_cancellation_point(); return ERROR; diff --git a/os/kernel/mqueue/mq_send.c b/os/kernel/mqueue/mq_send.c index ce35aaf8eb..e62000a292 100644 --- a/os/kernel/mqueue/mq_send.c +++ b/os/kernel/mqueue/mq_send.c @@ -123,7 +123,8 @@ * * EAGAIN The queue was empty, and the O_NONBLOCK flag was set for the * message queue description referred to by mqdes. - * EINVAL Either msg or mqdes is NULL or the value of prio is invalid. + * EINVAL Either msg or mqdes is NULL or the value of prio is invalid, + * or mqdes is present in task group's mq list. * EPERM Message queue opened not opened for writing. * EMSGSIZE 'msglen' was greater than the maxmsgsize attribute of the * message queue. @@ -149,6 +150,12 @@ int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio) /* mq_send() is a cancellation point */ (void)enter_cancellation_point(); + if (mq_check(mqdes) != OK) { + leave_cancellation_point(); + set_errno(EINVAL); + return ERROR; + } + if (mq_verifysend(mqdes, msg, msglen, prio) != OK) { leave_cancellation_point(); return ERROR; diff --git a/os/kernel/mqueue/mq_setattr.c b/os/kernel/mqueue/mq_setattr.c index 0c771113cd..6eb77ee5de 100644 --- a/os/kernel/mqueue/mq_setattr.c +++ b/os/kernel/mqueue/mq_setattr.c @@ -114,6 +114,10 @@ int mq_setattr(mqd_t mqdes, const struct mq_attr *mq_stat, struct mq_attr *oldst { int ret = ERROR; + if (mq_check(mqdes) != OK) { + return ERROR; + } + if (mqdes && mq_stat) { /* Return the attributes if so requested */