OSDN Git Service

rtl8139: check IP Total Length field (CVE-2015-5165)
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 15 Jul 2015 16:34:40 +0000 (17:34 +0100)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 3 Aug 2015 12:08:06 +0000 (13:08 +0100)
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>
hw/net/rtl8139.c

index 4eaa352..6859d76 100644 (file)
@@ -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)
             {