|
 |
05bba0 |
From 03a9670ae89e39fcfcd6b99ab66b4e4cab7c85b7 Mon Sep 17 00:00:00 2001
|
|
|
b2d9fb |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
b2d9fb |
Date: Fri, 31 Jul 2015 15:59:48 +0200
|
|
|
05bba0 |
Subject: [PATCH 13/13] rtl8139: check TCP Data Offset field (CVE-2015-5165)
|
|
|
b2d9fb |
|
|
|
b2d9fb |
Message-id: <1438358388-10575-8-git-send-email-stefanha@redhat.com>
|
|
|
b2d9fb |
Patchwork-id: 67242
|
|
|
b2d9fb |
O-Subject: [RHEL-7.1.z qemu-kvm EMBARGOED PATCH 7/7] rtl8139: check TCP Data Offset field (CVE-2015-5165)
|
|
|
05bba0 |
Bugzilla: 1248766
|
|
|
b2d9fb |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
b2d9fb |
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
|
b2d9fb |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
b2d9fb |
|
|
|
b2d9fb |
The TCP Data Offset field contains the length of the header. Make sure
|
|
|
b2d9fb |
it is valid and does not exceed the IP data length.
|
|
|
b2d9fb |
|
|
|
b2d9fb |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
b2d9fb |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
b2d9fb |
---
|
|
|
b2d9fb |
hw/net/rtl8139.c | 5 +++++
|
|
|
b2d9fb |
1 file changed, 5 insertions(+)
|
|
|
b2d9fb |
|
|
|
b2d9fb |
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
|
|
|
b2d9fb |
index c9bf454..4f89328 100644
|
|
|
b2d9fb |
--- a/hw/net/rtl8139.c
|
|
|
b2d9fb |
+++ b/hw/net/rtl8139.c
|
|
|
b2d9fb |
@@ -2231,6 +2231,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
|
|
|
b2d9fb |
|
|
|
b2d9fb |
int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr);
|
|
|
b2d9fb |
|
|
|
b2d9fb |
+ /* Invalid TCP data offset? */
|
|
|
b2d9fb |
+ if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) {
|
|
|
b2d9fb |
+ goto skip_offload;
|
|
|
b2d9fb |
+ }
|
|
|
b2d9fb |
+
|
|
|
b2d9fb |
/* ETH_MTU = ip header len + tcp header len + payload */
|
|
|
b2d9fb |
int tcp_data_len = ip_data_len - tcp_hlen;
|
|
|
b2d9fb |
int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen;
|
|
|
b2d9fb |
--
|
|
|
b2d9fb |
1.8.3.1
|
|
|
b2d9fb |
|