This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a65a44fff9 net/icmp: validate msg_iovlen and defer iov dereference
5a65a44fff9 is described below

commit 5a65a44fff9851bd75c38ec25c3acfed46301c78
Author: Swatantra Yadav <[email protected]>
AuthorDate: Wed Nov 11 16:07:41 2026 +0530

    net/icmp: validate msg_iovlen and defer iov dereference
    
    POSIX IEEE Std 1003.1 requires sendmsg() and recvmsg() to validate
    msg_iovlen and fail with -EMSGSIZE when msg_iovlen is 0 or greater
    than IOV_MAX. Furthermore, dereferencing msg->msg_iov in local variable
    initializations prior to validating msg_iovlen and msg_iov != NULL risks
    NULL pointer dereference or out-of-bounds access.
    
    This patch addresses these issues in net/icmp:
    1. Defer dereferencing msg->msg_iov until after validating msg_iovlen
       and confirming msg->msg_iov != NULL.
    2. Return -EMSGSIZE when msg_iovlen == 0 or msg_iovlen > IOV_MAX.
    3. Reject invalid buffers where len > 0 && buf == NULL with -EINVAL.
    4. Set MSG_TRUNC in msg->msg_flags when received data exceeds the
       user buffer in both icmp_readahead() and recvfrom_eventhandler().
    5. Widen recv_buflen to size_t and recv_result to ssize_t in
       struct icmp_recvfrom_s to prevent 16-bit integer wraparound on
       >=64KiB buffers.
    6. Remove artificial len < ICMP_HDRLEN rejection to allow short and
       zero-length buffers to reach truncation paths per POSIX.
    7. Use iob_copyout() in recvfrom_eventhandler() to safely copy across
       chained I/O buffers (dev->d_iob) without out-of-bounds heap read.
    
    Assisted-by: gemini-3.8-flash
    Signed-off-by: Swatantra Yadav <[email protected]>
---
 net/icmp/icmp_recvmsg.c | 57 ++++++++++++++++++++++++++++++++++++++-----------
 net/icmp/icmp_sendmsg.c | 35 ++++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/net/icmp/icmp_recvmsg.c b/net/icmp/icmp_recvmsg.c
index 8ee631d92e8..c2890b25a93 100644
--- a/net/icmp/icmp_recvmsg.c
+++ b/net/icmp/icmp_recvmsg.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <nuttx/debug.h>
 
 #include <nuttx/semaphore.h>
@@ -54,9 +55,10 @@ struct icmp_recvfrom_s
                                          * response */
   in_addr_t recv_from;                  /* The peer we received the request
                                          * from */
+  FAR struct msghdr *recv_msg;          /* Points to message header */
   FAR uint8_t *recv_buf;                /* Location to return the response */
-  uint16_t recv_buflen;                 /* Size of the response */
-  int16_t recv_result;                  /* >=0: receive size on success;
+  size_t recv_buflen;                   /* Size of the response */
+  ssize_t recv_result;                  /* >=0: receive size on success;
                                          * <0: negated errno on fail */
 };
 
@@ -134,15 +136,21 @@ static uint32_t recvfrom_eventhandler(FAR struct 
net_driver_s *dev,
           if (recvsize > pstate->recv_buflen)
             {
               recvsize = pstate->recv_buflen;
+              if (pstate->recv_msg != NULL)
+                {
+                  pstate->recv_msg->msg_flags |= MSG_TRUNC;
+                }
             }
 
           /* Copy the ICMP ECHO reply to the user provided buffer */
 
-          memcpy(pstate->recv_buf, IPBUF(offset), recvsize);
+          if (recvsize > 0)
+            {
+              iob_copyout(pstate->recv_buf, dev->d_iob, recvsize, offset);
+            }
 
           /* Return the size of the returned data */
 
-          DEBUGASSERT(recvsize <= INT16_MAX);
           pstate->recv_result = recvsize;
 
           /* Return the IPv4 address of the sender from the IPv4 header */
@@ -199,7 +207,8 @@ end_wait:
 static inline ssize_t icmp_readahead(FAR struct icmp_conn_s *conn,
                                      FAR void *buf, size_t buflen,
                                      FAR struct sockaddr_in *from,
-                                     FAR socklen_t *fromlen, bool raw)
+                                     FAR socklen_t *fromlen, bool raw,
+                                     FAR struct msghdr *msg)
 {
   FAR struct iob_s *iob;
   ssize_t ret = -ENODATA;
@@ -233,6 +242,14 @@ static inline ssize_t icmp_readahead(FAR struct 
icmp_conn_s *conn,
           offset = (ipv4->vhl & IPv4_HLMASK) << 2;
         }
 
+      if ((size_t)(iob->io_pktlen - offset) > buflen)
+        {
+          if (msg != NULL)
+            {
+              msg->msg_flags |= MSG_TRUNC;
+            }
+        }
+
       ret = (ssize_t)iob_copyout(buf, iob, buflen, offset);
 
       ninfo("Received %ld bytes (of %u)\n", (long)ret, iob->io_pktlen);
@@ -285,26 +302,39 @@ static inline ssize_t icmp_readahead(FAR struct 
icmp_conn_s *conn,
 ssize_t icmp_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
                      int flags)
 {
-  FAR void *buf = msg->msg_iov->iov_base;
-  size_t len = msg->msg_iov->iov_len;
   FAR struct sockaddr *from = msg->msg_name;
   FAR socklen_t *fromlen = &msg->msg_namelen;
   FAR struct sockaddr_in *inaddr;
   FAR struct icmp_conn_s *conn;
   FAR struct net_driver_s *dev = NULL;
+  FAR void *buf;
+  size_t len;
   struct icmp_recvfrom_s state;
   ssize_t ret;
 
-  /* Some sanity checks */
+  /* POSIX: fail with EMSGSIZE if msg_iovlen <= 0 or > IOV_MAX */
+
+  if (msg->msg_iovlen == 0 || msg->msg_iovlen > IOV_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
+  /* Validity check, only single iov supported */
 
   if (msg->msg_iovlen != 1)
     {
       return -ENOTSUP;
     }
 
-  DEBUGASSERT(buf != NULL);
+  if (msg->msg_iov == NULL)
+    {
+      return -EINVAL;
+    }
+
+  buf = msg->msg_iov[0].iov_base;
+  len = msg->msg_iov[0].iov_len;
 
-  if (len < ICMP_HDRLEN)
+  if (len > 0 && buf == NULL)
     {
       return -EINVAL;
     }
@@ -324,6 +354,8 @@ ssize_t icmp_recvmsg(FAR struct socket *psock, FAR struct 
msghdr *msg,
   conn = psock->s_conn;
   dev = conn->dev;
 
+  msg->msg_flags = 0;
+
   conn_dev_lock(&conn->sconn, dev);
   if (psock->s_type != SOCK_RAW)
     {
@@ -343,7 +375,7 @@ ssize_t icmp_recvmsg(FAR struct socket *psock, FAR struct 
msghdr *msg,
   if (!IOB_QEMPTY(&conn->readahead))
     {
       ret = icmp_readahead(conn, buf, len, (FAR struct sockaddr_in *)from,
-                           fromlen, psock->s_type == SOCK_RAW);
+                           fromlen, psock->s_type == SOCK_RAW, msg);
     }
   else if (_SS_ISNONBLOCK(conn->sconn.s_flags) ||
            (flags & MSG_DONTWAIT) != 0)
@@ -361,6 +393,7 @@ ssize_t icmp_recvmsg(FAR struct socket *psock, FAR struct 
msghdr *msg,
 
       state.recv_sock   = psock;    /* The IPPROTO_ICMP socket instance */
       state.recv_result = -ENOMEM;  /* Assume allocation failure */
+      state.recv_msg    = msg;      /* Points to message header */
       state.recv_buf    = buf;      /* Location to return the response */
       state.recv_buflen = len;      /* Size of the response */
 
@@ -397,7 +430,7 @@ ssize_t icmp_recvmsg(FAR struct socket *psock, FAR struct 
msghdr *msg,
 
       if (state.recv_result < 0)
         {
-          nerr("ERROR: Return error=%d\n", state.recv_result);
+          nerr("ERROR: Return error=%d\n", (int)state.recv_result);
           ret = state.recv_result;
           goto errout;
         }
diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c
index 029ad1491f8..39b77a83491 100644
--- a/net/icmp/icmp_sendmsg.c
+++ b/net/icmp/icmp_sendmsg.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdint.h>
+#include <limits.h>
 #include <stdbool.h>
 #include <string.h>
 #include <assert.h>
@@ -268,17 +269,24 @@ end_wait:
 ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
                      int flags)
 {
-  FAR const void *buf = msg->msg_iov->iov_base;
-  size_t len = msg->msg_iov->iov_len;
-  FAR const struct sockaddr *to = msg->msg_name;
-  socklen_t tolen = msg->msg_namelen;
+  FAR const struct sockaddr *to;
   FAR const struct sockaddr_in *inaddr;
   FAR struct net_driver_s *dev;
   FAR struct icmp_conn_s *conn;
   FAR struct icmp_hdr_s *icmp;
+  FAR const void *buf;
+  socklen_t tolen;
+  size_t len;
   struct icmp_sendto_s state;
   ssize_t ret;
 
+  /* POSIX: fail with EMSGSIZE if msg_iovlen <= 0 or > IOV_MAX */
+
+  if (msg->msg_iovlen == 0 || msg->msg_iovlen > IOV_MAX)
+    {
+      return -EMSGSIZE;
+    }
+
   /* Validity check, only single iov supported */
 
   if (msg->msg_iovlen != 1)
@@ -286,6 +294,21 @@ ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const 
struct msghdr *msg,
       return -ENOTSUP;
     }
 
+  if (msg->msg_iov == NULL)
+    {
+      return -EINVAL;
+    }
+
+  buf   = msg->msg_iov[0].iov_base;
+  len   = msg->msg_iov[0].iov_len;
+  to    = msg->msg_name;
+  tolen = msg->msg_namelen;
+
+  if (len > 0 && buf == NULL)
+    {
+      return -EINVAL;
+    }
+
   if (to == NULL)
     {
       /* icmp_send() */
@@ -299,8 +322,6 @@ ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const 
struct msghdr *msg,
 
   /* Some sanity checks */
 
-  DEBUGASSERT(buf != NULL && to != NULL);
-
   if (len < ICMP_HDRLEN || tolen < sizeof(struct sockaddr_in))
     {
       return -EINVAL;
@@ -399,7 +420,7 @@ ssize_t icmp_sendmsg(FAR struct socket *psock, FAR const 
struct msghdr *msg,
           conn->id = icmp->id;
         }
 
-        conn->dev = dev;
+      conn->dev = dev;
 
       /* Notify the device driver of the availability of TX data */
 

Reply via email to