]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/qemu-xen.git/commitdiff
slirp: goto bad in udp_input if sosendto fails
authorGuillaume Subiron <maethor@subiron.org>
Sat, 19 Dec 2015 21:24:55 +0000 (22:24 +0100)
committerJason Wang <jasowang@redhat.com>
Thu, 4 Feb 2016 05:22:06 +0000 (13:22 +0800)
Before this patch, if sosendto fails, udp_input is executed as if the
packet was sent, recording the packet for icmp errors, which does not
makes sense since the packet was not actually sent, errors would be
related to a previous packet.

This patch adds a goto bad to cut the execution of this function.

Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
slirp/udp.c

index fee13b4dbda1ab6f55de9a063b349f1c6e462911..ce63414c81bea574e91a821807ae0d665534b112 100644 (file)
@@ -218,6 +218,7 @@ udp_input(register struct mbuf *m, int iphlen)
          *ip=save_ip;
          DEBUG_MISC((dfd,"udp tx errno = %d-%s\n",errno,strerror(errno)));
          icmp_error(m, ICMP_UNREACH,ICMP_UNREACH_NET, 0,strerror(errno));
+         goto bad;
        }
 
        m_free(so->so_m);   /* used for ICMP if error on sorecvfrom */