Changeset 80980 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Sep 24, 2019 3:31:55 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133573

Message:

NAT: Make sure tftpSendError() always terminate the session.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.h (modified) (1 diff)
• tftp.c (modified) (5 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -529 +529 @@
 }
 
-static inline struct mbuf *slirpTftpMbufAlloc(PNATState pData)
-{
-    return slirpServiceMbufAlloc(pData, CTL_TFTP);
-}
 static inline struct mbuf *slirpDnsMbufAlloc(PNATState pData)
 {

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -124 +124 @@
 };
 
+
+DECLINLINE(struct mbuf *) slirpTftpMbufAlloc(PNATState pData)
+{
+    struct mbuf *m = slirpServiceMbufAlloc(pData, CTL_TFTP);
+    if (RT_UNLIKELY(m == NULL))
+        LogFlowFunc(("LEAVE: Can't allocate mbuf\n"));
+    return m;
+}
+
+
 /**
  * This function evaluate file name.
@@ -636 +646 @@
 }
 
+
 DECLINLINE(int) tftpSendError(PNATState pData,
                               PTFTPSESSION pTftpSession,
@@ -643 +654 @@
 {
     struct mbuf *m = NULL;
-    PTFTPIPHDR pTftpIpHeader = NULL;
-    u_int cbMsg = (u_int)strlen(msg) + 1; /* ending zero */
 
     LogFlowFunc(("ENTER: errorcode: %RX16, msg: %s\n", errorcode, msg));
     m = slirpTftpMbufAlloc(pData);
-    if (!m)
-    {
-        LogFlowFunc(("LEAVE: Can't allocate mbuf\n"));
-        return -1;
-    }
-
-    m->m_data += if_maxlinkhdr;
-    m->m_len = sizeof(TFTPIPHDR) + cbMsg;
-    m->m_pkthdr.header = mtod(m, void *);
-    pTftpIpHeader = mtod(m, PTFTPIPHDR);
-
-    pTftpIpHeader->u16TftpOpType = RT_H2N_U16_C(TFTP_ERROR);
-    pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(errorcode);
-
-    m_copyback(pData, m, sizeof(TFTPIPHDR), cbMsg, (c_caddr_t)msg);
-
-    tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);
+    if (m != NULL)
+    {
+        u_int cbMsg = (u_int)strlen(msg) + 1; /* ending zero */
+        PTFTPIPHDR pTftpIpHeader;
+
+        m->m_data += if_maxlinkhdr;
+        m->m_len = sizeof(TFTPIPHDR) + cbMsg;
+        m->m_pkthdr.header = mtod(m, void *);
+        pTftpIpHeader = mtod(m, PTFTPIPHDR);
+
+        pTftpIpHeader->u16TftpOpType = RT_H2N_U16_C(TFTP_ERROR);
+        pTftpIpHeader->Core.u16TftpOpCode = RT_H2N_U16(errorcode);
+
+        m_copyback(pData, m, sizeof(TFTPIPHDR), cbMsg, (c_caddr_t)msg);
+
+        tftpSend(pData, pTftpSession, m, pcTftpIpHeaderRecv);
+    }
 
     tftpSessionTerminate(pTftpSession);
@@ -671 +680 @@
     return 0;
 }
+
 
 static int tftpSendData(PNATState pData,
@@ -687 +697 @@
     {
         tftpSendError(pData, pTftpSession, 6, "ACK is wrong", pcTftpIpHeaderRecv);
-        tftpSessionTerminate(pTftpSession);
         return -1;
     }