Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mq_open: add long file name check and parameter check

Browse Source 
N/A

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
Change-Id: I2d2c78e4477b4a6af13e51b79f24e8fd1794d291
This commit is contained in:
anjiahao
2021-07-12 22:15:25 +08:00
committed by Xiang Xiao
parent 4ad06bc4ed
commit 2c9093ad9d
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/mqueue/mq_open.c
+2 -3
View File
@@ -295,10 +295,9 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
* be created with a reference count of zero. * be created with a reference count of zero.
*/ */
msgq = (FAR struct mqueue_inode_s *)nxmq_alloc_msgq(attr); ret = nxmq_alloc_msgq(attr, &msgq);
if (!msgq) if (ret < 0)
{ {
ret = -ENOSPC;
goto errout_with_inode; goto errout_with_inode;
} }
include/nuttx/mqueue.h
+2 -1
View File
@@ -397,7 +397,8 @@ void nxmq_free_msgq(FAR struct mqueue_inode_s *msgq);
* *
****************************************************************************/ ****************************************************************************/
FAR struct mqueue_inode_s *nxmq_alloc_msgq(FAR struct mq_attr *attr); int nxmq_alloc_msgq(FAR struct mq_attr *attr,
FAR struct mqueue_inode_s **msgq);
/**************************************************************************** /****************************************************************************
* Name: nxmq_pollnotify * Name: nxmq_pollnotify
sched/mqueue/mq_msgqalloc.c
+27 -17
View File
@@ -49,50 +49,60 @@
* attr - The mq_maxmsg attribute is used at the time that the message * attr - The mq_maxmsg attribute is used at the time that the message
* queue is created to determine the maximum number of * queue is created to determine the maximum number of
* messages that may be placed in the message queue. * messages that may be placed in the message queue.
* msgq - This parameter is a address of a pointer
* *
* Returned Value: * Returned Value:
* The allocated and initialized message queue structure or NULL in the * IF the function runs successfully，will return Zero(OK),else will
* event of a failure. * return a error code.
*
* EINVAL attr is a null pointer and attr->mq_mqssize or attr->mq_maxmsg
* is an invalid value.
* ENOMEM No memery to alloc.
* *
****************************************************************************/ ****************************************************************************/
FAR struct mqueue_inode_s *nxmq_alloc_msgq(FAR struct mq_attr *attr) int nxmq_alloc_msgq(FAR struct mq_attr *attr,
FAR struct mqueue_inode_s **msgq)
{ {
FAR struct mqueue_inode_s *msgq;
/* Check if the caller is attempting to allocate a message for messages /* Check if the caller is attempting to allocate a message for messages
* larger than the configured maximum message size. * larger than the configured maximum message size.
*/ */
DEBUGASSERT(!attr || attr->mq_msgsize <= MQ_MAX_BYTES); DEBUGASSERT((!attr || (attr->mq_msgsize <= MQ_MAX_BYTES &&
if (attr && attr->mq_msgsize > MQ_MAX_BYTES) attr->mq_maxmsg <= MQ_MAX_MSGS)) && msgq);
if ((attr && (attr->mq_msgsize > MQ_MAX_BYTES ||
attr->mq_maxmsg > MQ_MAX_MSGS)) || !msgq)
{ {
return NULL; return -EINVAL;
} }
/* Allocate memory for the new message queue. */ /* Allocate memory for the new message queue. */
msgq = (FAR struct mqueue_inode_s *) *msgq = (FAR struct mqueue_inode_s *)
kmm_zalloc(sizeof(struct mqueue_inode_s)); kmm_zalloc(sizeof(struct mqueue_inode_s));
if (msgq) if (*msgq)
{ {
/* Initialize the new named message queue */ /* Initialize the new named message queue */
sq_init(&msgq->msglist); sq_init(&(*msgq)->msglist);
if (attr) if (attr)
{ {
msgq->maxmsgs = (int16_t)attr->mq_maxmsg; (*msgq)->maxmsgs = (int16_t)attr->mq_maxmsg;
msgq->maxmsgsize = (int16_t)attr->mq_msgsize; (*msgq)->maxmsgsize = (int16_t)attr->mq_msgsize;
} }
else else
{ {
msgq->maxmsgs = MQ_MAX_MSGS; (*msgq)->maxmsgs = MQ_MAX_MSGS;
msgq->maxmsgsize = MQ_MAX_BYTES; (*msgq)->maxmsgsize = MQ_MAX_BYTES;
} }
msgq->ntpid = INVALID_PROCESS_ID; (*msgq)->ntpid = INVALID_PROCESS_ID;
}
else
{
return -ENOMEM;
} }
return msgq; return OK;
} }