| From bea12592014d3371ca8d65fdf7cba2e84d3d46b7 Mon Sep 17 00:00:00 2001 |
| From: Stefan Hajnoczi <stefanha@redhat.com> |
| Date: Fri, 31 Jul 2015 15:59:45 +0200 |
| Subject: [PATCH 10/13] rtl8139: check IP Header Length field (CVE-2015-5165) |
| |
| Message-id: <1438358388-10575-5-git-send-email-stefanha@redhat.com> |
| Patchwork-id: 67239 |
| O-Subject: [RHEL-7.1.z qemu-kvm EMBARGOED PATCH 4/7] rtl8139: check IP Header Length field (CVE-2015-5165) |
| Bugzilla: 1248766 |
| RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> |
| RH-Acked-by: Xiao Wang <jasowang@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| |
| The IP Header Length field was only checked in the IP checksum case, but |
| is used in other cases too. |
| |
| Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| hw/net/rtl8139.c | 19 ++++++++----------- |
| 1 file changed, 8 insertions(+), 11 deletions(-) |
| |
| diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c |
| index 409029d..7efc0b5 100644 |
| |
| |
| @@ -2178,6 +2178,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; |
| |
| @@ -2185,17 +2189,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) |
| -- |
| 1.8.3.1 |
| |