From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Wed, 15 Jul 2015 16:34:40 +0000 (+0100)
Subject: rtl8139: check IP Total Length field (CVE-2015-5165)
X-Git-Tag: v2.3.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7a197c39e4b2099f25d2137e8d73c53c37b92c6;p=thirdparty%2Fqemu.git

rtl8139: check IP Total Length field (CVE-2015-5165)

The IP Total Length field includes the IP header and data.  Make sure it
is valid and does not exceed the Ethernet payload size.

Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit c6296ea88df040054ccd781f3945fe103f8c7c17)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 2d978660be8..c88bf9b3115 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -2191,7 +2191,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
             }
 
             ip_protocol = ip->ip_p;
-            ip_data_len = be16_to_cpu(ip->ip_len) - hlen;
+
+            ip_data_len = be16_to_cpu(ip->ip_len);
+            if (ip_data_len < hlen || ip_data_len > eth_payload_len) {
+                goto skip_offload;
+            }
+            ip_data_len -= hlen;
 
             if (txdw0 & CP_TX_IPCS)
             {