diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-07-15 17:32:32 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-08-03 13:08:03 +0100 |
| commit | 03247d43c577dfea8181cd40177ad5ba77c8db76 (patch) | |
| tree | c08d1602d78e87a7fb994c32874171f3996bcf9a | |
| parent | e1c120a9c54872f8a538ff9129d928de4e865cbd (diff) | |
| download | focaccia-qemu-03247d43c577dfea8181cd40177ad5ba77c8db76.tar.gz focaccia-qemu-03247d43c577dfea8181cd40177ad5ba77c8db76.zip | |
rtl8139: check IP Header Length field (CVE-2015-5165)
The IP Header Length field was only checked in the IP checksum case, but is used in other cases too. Reported-by: 朱东海(启路) <donghai.zdh@alibaba-inc.com> Reviewed-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/net/rtl8139.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 1c620763d8..4eaa352f1a 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2186,6 +2186,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } hlen = IP_HEADER_LENGTH(ip); + if (hlen < sizeof(ip_header) || hlen > eth_payload_len) { + goto skip_offload; + } + ip_protocol = ip->ip_p; ip_data_len = be16_to_cpu(ip->ip_len) - hlen; @@ -2193,17 +2197,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) { DPRINTF("+++ C+ mode need IP checksum\n"); - if (hlen<sizeof(ip_header) || hlen>eth_payload_len) {/* min header length */ - /* bad packet header len */ - /* or packet too short */ - } - else - { - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(ip, hlen); - DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", - hlen, ip->ip_sum); - } + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(ip, hlen); + DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", + hlen, ip->ip_sum); } if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) |