vendor libslirp v4.1.0

https://gitlab.freedesktop.org/slirp/libslirp/compare/d171af3732a0610a25334b06b77fa547bd677918...6651ba26c4e94f64d6448a2db4991269ce553bd9

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Author: AkihiroSuda

vendor.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux -o pipefail
-# Nov 21, 2019
-LIBSLIRP_COMMIT=d171af3732a0610a25334b06b77fa547bd677918
+# Dec 4, 2019 (v4.1.0)
+LIBSLIRP_COMMIT=6651ba26c4e94f64d6448a2db4991269ce553bd9
 LIBSLIRP_REPO=https://gitlab.freedesktop.org/slirp/libslirp.git
 
 # Jul 12, 2019

vendor/README.md

@@ -1,7 +1,7 @@
 # DO NOT EDIT MANUALLY
 
 Vendored components:
-* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`d171af3732a0610a25334b06b77fa547bd677918`)
+* libslirp: https://gitlab.freedesktop.org/slirp/libslirp.git (`6651ba26c4e94f64d6448a2db4991269ce553bd9`)
 * parson: https://github.com/kgabis/parson.git (`c5bb9557fe98367aa8e041c65863909f12ee76b2`)
 
 Please do not edit the contents under this directory manually.

vendor/libslirp/src/arp_table.c

@@ -71,7 +71,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr,
     DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){ .s_addr = ip_addr }));
 
     /* If broadcast address */
-    if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) {
+    if (ip_addr == 0 || ip_addr == 0xffffffff || ip_addr == broadcast_addr) {
         /* return Ethernet broadcast address */
         memset(out_ethaddr, 0xff, ETH_ALEN);
         return 1;

vendor/libslirp/src/dnssearch.c

@@ -238,13 +238,8 @@ int translate_dnssearch(Slirp *s, const char **names)
     size_t i, num_domains, memreq = 0;
     uint8_t *result = NULL, *outptr;
     CompactDomain *domains = NULL;
-    const char **nameptr = names;
 
-    while (*nameptr != NULL) {
-        nameptr++;
-    }
-
-    num_domains = nameptr - names;
+    num_domains = g_strv_length((GStrv)names);
     if (num_domains == 0) {
         return -2;
     }

vendor/libslirp/src/libslirp-version.h

@@ -7,7 +7,7 @@ extern "C" {
 #endif
 
 #define SLIRP_MAJOR_VERSION 4
-#define SLIRP_MINOR_VERSION 0
+#define SLIRP_MINOR_VERSION 1
 #define SLIRP_MICRO_VERSION 0
 
 #define SLIRP_CHECK_VERSION(major,minor,micro)                          \

vendor/libslirp/src/sbuf.c

@@ -9,19 +9,17 @@ static void sbappendsb(struct sbuf *sb, struct mbuf *m);
 
 void sbfree(struct sbuf *sb)
 {
-    free(sb->sb_data);
+    g_free(sb->sb_data);
 }
 
-bool sbdrop(struct sbuf *sb, int num)
+bool sbdrop(struct sbuf *sb, size_t num)
 {
     int limit = sb->sb_datalen / 2;
 
-    /*
-     * We can only drop how much we have
-     * This should never succeed
-     */
+    g_warn_if_fail(num <= sb->sb_cc);
     if (num > sb->sb_cc)
         num = sb->sb_cc;
+
     sb->sb_cc -= num;
     sb->sb_rptr += num;
     if (sb->sb_rptr >= sb->sb_data + sb->sb_datalen)
@@ -34,30 +32,11 @@ bool sbdrop(struct sbuf *sb, int num)
     return false;
 }
 
-void sbreserve(struct sbuf *sb, int size)
+void sbreserve(struct sbuf *sb, size_t size)
 {
-    if (sb->sb_data) {
-        /* Already alloced, realloc if necessary */
-        if (sb->sb_datalen != size) {
-            char *new = realloc(sb->sb_data, size);
-            sb->sb_cc = 0;
-            if (new) {
-                sb->sb_data = sb->sb_wptr = sb->sb_rptr = new;
-                sb->sb_datalen = size;
-            } else {
-                free(sb->sb_data);
-                sb->sb_data = sb->sb_wptr = sb->sb_rptr = NULL;
-                sb->sb_datalen = 0;
-            }
-        }
-    } else {
-        sb->sb_wptr = sb->sb_rptr = sb->sb_data = (char *)malloc(size);
-        sb->sb_cc = 0;
-        if (sb->sb_wptr)
-            sb->sb_datalen = size;
-        else
-            sb->sb_datalen = 0;
-    }
+    sb->sb_wptr = sb->sb_rptr = sb->sb_data = g_realloc(sb->sb_data, size);
+    sb->sb_cc = 0;
+    sb->sb_datalen = size;
 }
 
 /*
@@ -164,17 +143,17 @@ static void sbappendsb(struct sbuf *sb, struct mbuf *m)
  * Don't update the sbuf rptr, this will be
  * done in sbdrop when the data is acked
  */
-void sbcopy(struct sbuf *sb, int off, int len, char *to)
+void sbcopy(struct sbuf *sb, size_t off, size_t len, char *to)
 {
     char *from;
 
+    g_assert(len + off <= sb->sb_cc);
+
     from = sb->sb_rptr + off;
     if (from >= sb->sb_data + sb->sb_datalen)
         from -= sb->sb_datalen;
 
     if (from < sb->sb_wptr) {
-        if (len > sb->sb_cc)
-            len = sb->sb_cc;
         memcpy(to, from, len);
     } else {
         /* re-use off */

vendor/libslirp/src/sbuf.h

@@ -18,10 +18,10 @@ struct sbuf {
     char *sb_data; /* Actual data */
 };
 
-void sbfree(struct sbuf *);
-bool sbdrop(struct sbuf *, int);
-void sbreserve(struct sbuf *, int);
-void sbappend(struct socket *, struct mbuf *);
-void sbcopy(struct sbuf *, int, int, char *);
+void sbfree(struct sbuf *sb);
+bool sbdrop(struct sbuf *sb, size_t len);
+void sbreserve(struct sbuf *sb, size_t size);
+void sbappend(struct socket *sb, struct mbuf *mb);
+void sbcopy(struct sbuf *sb, size_t off, size_t len, char *p);
 
 #endif

vendor/libslirp/src/slirp.c

@@ -845,11 +845,6 @@ static int if_encap4(Slirp *slirp, struct mbuf *ifm, struct ethhdr *eh,
 {
     const struct ip *iph = (const struct ip *)ifm->m_data;
 
-    if (iph->ip_dst.s_addr == 0) {
-        /* 0.0.0.0 can not be a destination address, something went wrong,
-         * avoid making it worse */
-        return 1;
-    }
     if (!arp_table_search(slirp, iph->ip_dst.s_addr, ethaddr)) {
         uint8_t arp_req[ETH_HLEN + sizeof(struct slirp_arphdr)];
         struct ethhdr *reh = (struct ethhdr *)arp_req;

vendor/libslirp/src/slirp.h

@@ -266,7 +266,7 @@ struct tcpcb *tcp_close(register struct tcpcb *);
 void tcp_sockclosed(struct tcpcb *);
 int tcp_fconnect(struct socket *, unsigned short af);
 void tcp_connect(struct socket *);
-int tcp_attach(struct socket *);
+void tcp_attach(struct socket *);
 uint8_t tcp_tos(struct socket *);
 int tcp_emu(struct socket *, struct mbuf *);
 int tcp_ctl(struct socket *);

vendor/libslirp/src/socket.c

@@ -95,7 +95,7 @@ void sofree(struct socket *so)
         remque(so); /* crashes if so is not in a queue */
 
     if (so->so_tcpcb) {
-        free(so->so_tcpcb);
+        g_free(so->so_tcpcb);
     }
     g_free(so);
 }
@@ -846,6 +846,9 @@ int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
             } else {
                 sin->sin_addr = loopback_addr;
             }
+        } else if (!slirp->disable_host_loopback && so->so_faddr.s_addr == 0xffffffff) {
+            /* Receive broadcast as well */
+            sin->sin_addr = loopback_addr;
         }
         break;
     case AF_INET6:
@@ -865,6 +868,9 @@ int sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
             } else {
                 sin6->sin6_addr = in6addr_loopback;
             }
+        } else if (!slirp->disable_host_loopback
+                   && in6_equal(&so->so_faddr6, &(struct in6_addr) ALLNODES_MULTICAST)) {
+            sin6->sin6_addr = in6addr_loopback;
         }
         break;
 

vendor/libslirp/src/state.c

@@ -107,9 +107,6 @@ static int sbuf_tmp_post_load(void *opaque, int version)
     /* Allocate the buffer space used by the field after the tmp */
     sbreserve(tmp->parent, tmp->parent->sb_datalen);
 
-    if (tmp->parent->sb_datalen != requested_len) {
-        return -ENOMEM;
-    }
     if (tmp->woff >= requested_len || tmp->roff >= requested_len) {
         g_critical("invalid sbuf offsets r/w=%u/%u len=%u", tmp->roff,
                    tmp->woff, requested_len);
@@ -159,9 +156,8 @@ static bool slirp_family_inet(void *opaque, int version_id)
 static int slirp_socket_pre_load(void *opaque)
 {
     struct socket *so = opaque;
-    if (tcp_attach(so) < 0) {
-        return -ENOMEM;
-    }
+
+    tcp_attach(so);
     /* Older versions don't load these fields */
     so->so_ffamily = AF_INET;
     so->so_lfamily = AF_INET;

vendor/libslirp/src/tcp_input.c

@@ -408,10 +408,7 @@ void tcp_input(struct mbuf *m, int iphlen, struct socket *inso,
             goto dropwithreset;
 
         so = socreate(slirp);
-        if (tcp_attach(so) < 0) {
-            g_free(so); /* Not sofree (if it failed, it's not insqued) */
-            goto dropwithreset;
-        }
+        tcp_attach(so);
 
         sbreserve(&so->so_snd, TCP_SNDSPACE);
         sbreserve(&so->so_rcv, TCP_RCVSPACE);

vendor/libslirp/src/tcp_subr.c

@@ -255,11 +255,7 @@ struct tcpcb *tcp_newtcpcb(struct socket *so)
 {
     register struct tcpcb *tp;
 
-    tp = (struct tcpcb *)malloc(sizeof(*tp));
-    if (tp == NULL)
-        return ((struct tcpcb *)0);
-
-    memset((char *)tp, 0, sizeof(struct tcpcb));
+    tp = g_new0(struct tcpcb, 1);
     tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
     /*
      * 40: length of IPv4 header (20) + TCP header (20)
@@ -336,7 +332,7 @@ struct tcpcb *tcp_close(struct tcpcb *tp)
         remque(tcpiphdr2qlink(tcpiphdr_prev(t)));
         m_free(m);
     }
-    free(tp);
+    g_free(tp);
     so->so_tcpcb = NULL;
     /* clobber input socket cache if we're closing the cached connection */
     if (so == slirp->tcp_last_so)
@@ -377,8 +373,8 @@ void tcp_sockclosed(struct tcpcb *tp)
     case TCPS_LISTEN:
     case TCPS_SYN_SENT:
         tp->t_state = TCPS_CLOSED;
-        tp = tcp_close(tp);
-        break;
+        tcp_close(tp);
+        return;
 
     case TCPS_SYN_RECEIVED:
     case TCPS_ESTABLISHED:
@@ -474,10 +470,7 @@ void tcp_connect(struct socket *inso)
         so = inso;
     } else {
         so = socreate(slirp);
-        if (tcp_attach(so) < 0) {
-            g_free(so); /* NOT sofree */
-            return;
-        }
+        tcp_attach(so);
         so->lhost = inso->lhost;
         so->so_ffamily = inso->so_ffamily;
     }
@@ -528,14 +521,10 @@ void tcp_connect(struct socket *inso)
 /*
  * Attach a TCPCB to a socket.
  */
-int tcp_attach(struct socket *so)
+void tcp_attach(struct socket *so)
 {
-    if ((so->so_tcpcb = tcp_newtcpcb(so)) == NULL)
-        return -1;
-
+    so->so_tcpcb = tcp_newtcpcb(so);
     insque(so, &so->slirp->tcb);
-
-    return 0;
 }
 
 /*

vendor/libslirp/src/vmstate.c

@@ -321,7 +321,6 @@ static int vmstate_save_state_v(SlirpOStream *f, const VMStateDescription *vmsd,
             }
             for (i = 0; i < n_elems; i++) {
                 void *curr_elem = first_elem + size * i;
-                ret = 0;
 
                 if (field->flags & VMS_ARRAY_OF_POINTER) {
                     assert(curr_elem);