diff --git a/fs/mqueue/mq_open.c b/fs/mqueue/mq_open.c
index 7895abaa2a9..aea79c559dd 100644
--- a/fs/mqueue/mq_open.c
+++ b/fs/mqueue/mq_open.c
@@ -176,6 +176,12 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
       goto errout;
     }
 
+  if (strlen(mq_name) > NAME_MAX)
+    {
+      ret = -ENAMETOOLONG;
+      goto errout;
+    }
+
   /* Were we asked to create it? */
 
   if ((oflags & O_CREAT) != 0)
@@ -286,10 +292,9 @@ static int file_mq_vopen(FAR struct file *mq, FAR const char *mq_name,
        * be created with a reference count of zero.
        */
 
-      msgq = (FAR struct mqueue_inode_s *)nxmq_alloc_msgq(attr);
-      if (!msgq)
+      ret = nxmq_alloc_msgq(attr, &msgq);
+      if (ret < 0)
         {
-          ret = -ENOSPC;
           goto errout_with_inode;
         }
 
diff --git a/fs/mqueue/mqueue.h b/fs/mqueue/mqueue.h
index aac018ef50e..aacb6b8f3c1 100644
--- a/fs/mqueue/mqueue.h
+++ b/fs/mqueue/mqueue.h
@@ -39,6 +39,6 @@
 
 /* Sizes of things */
 
-#define MAX_MQUEUE_PATH 64
+#define MAX_MQUEUE_PATH (sizeof(CONFIG_FS_MQUEUE_MPATH) + NAME_MAX)
 
 #endif /* __FS_MQUEUE_MQUEUE_H */
diff --git a/include/nuttx/mqueue.h b/include/nuttx/mqueue.h
index 81d79567004..b6d99543936 100644
--- a/include/nuttx/mqueue.h
+++ b/include/nuttx/mqueue.h
@@ -385,14 +385,20 @@ void nxmq_free_msgq(FAR struct mqueue_inode_s *msgq);
  *   attr   - The mq_maxmsg attribute is used at the time that the message
  *            queue is created to determine the maximum number of
  *            messages that may be placed in the message queue.
+ *   msgq   - This parameter is a address of a pointer
  *
  * Returned Value:
- *   The allocated and initialized message queue structure or NULL in the
- *   event of a failure.
+ *   IF the function runs successfully，will return Zero(OK),else will
+ *   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);
 
 /****************************************************************************
  * Name: nxmq_pollnotify
diff --git a/sched/mqueue/mq_msgqalloc.c b/sched/mqueue/mq_msgqalloc.c
index 7209f433a9f..80a0f32596f 100644
--- a/sched/mqueue/mq_msgqalloc.c
+++ b/sched/mqueue/mq_msgqalloc.c
@@ -49,50 +49,60 @@
  *   attr   - The mq_maxmsg attribute is used at the time that the message
  *            queue is created to determine the maximum number of
  *            messages that may be placed in the message queue.
+ *   msgq   - This parameter is a address of a pointer
  *
  * Returned Value:
- *   The allocated and initialized message queue structure or NULL in the
- *   event of a failure.
+ *   IF the function runs successfully，will return Zero(OK),else will
+ *   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
    * larger than the configured maximum message size.
    */
 
-  DEBUGASSERT(!attr || attr->mq_msgsize <= MQ_MAX_BYTES);
-  if (attr && attr->mq_msgsize > MQ_MAX_BYTES)
+  DEBUGASSERT((!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. */
 
-  msgq = (FAR struct mqueue_inode_s *)
+  *msgq = (FAR struct mqueue_inode_s *)
     kmm_zalloc(sizeof(struct mqueue_inode_s));
 
-  if (msgq)
+  if (*msgq)
     {
       /* Initialize the new named message queue */
 
-      sq_init(&msgq->msglist);
+      sq_init(&(*msgq)->msglist);
       if (attr)
         {
-          msgq->maxmsgs    = (int16_t)attr->mq_maxmsg;
-          msgq->maxmsgsize = (int16_t)attr->mq_msgsize;
+          (*msgq)->maxmsgs    = (int16_t)attr->mq_maxmsg;
+          (*msgq)->maxmsgsize = (int16_t)attr->mq_msgsize;
         }
       else
         {
-          msgq->maxmsgs    = MQ_MAX_MSGS;
-          msgq->maxmsgsize = MQ_MAX_BYTES;
+          (*msgq)->maxmsgs    = MQ_MAX_MSGS;
+          (*msgq)->maxmsgsize = MQ_MAX_BYTES;
         }
 
-      msgq->ntpid = INVALID_PROCESS_ID;
+      (*msgq)->ntpid = INVALID_PROCESS_ID;
+    }
+  else
+    {
+      return -ENOMEM;
     }
 
-  return msgq;
+  return OK;
 }