|
 |
05bba0 |
From 62f1eddbc1e0261ff18e5a0dd0e0db23a93e8d4e Mon Sep 17 00:00:00 2001
|
|
|
b2d9fb |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
b2d9fb |
Date: Fri, 31 Jul 2015 15:59:47 +0200
|
|
|
05bba0 |
Subject: [PATCH 12/13] rtl8139: skip offload on short TCP header
|
|
|
05bba0 |
(CVE-2015-5165)
|
|
|
b2d9fb |
|
|
|
b2d9fb |
Message-id: <1438358388-10575-7-git-send-email-stefanha@redhat.com>
|
|
|
b2d9fb |
Patchwork-id: 67241
|
|
|
b2d9fb |
O-Subject: [RHEL-7.1.z qemu-kvm EMBARGOED PATCH 6/7] rtl8139: skip offload on short TCP header (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 |
TCP Large Segment Offload accesses the TCP header in the packet. If the
|
|
|
b2d9fb |
packet is too short we must not attempt to access header fields:
|
|
|
b2d9fb |
|
|
|
b2d9fb |
tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen);
|
|
|
b2d9fb |
int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr);
|
|
|
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 61bc34c..c9bf454 100644
|
|
|
b2d9fb |
--- a/hw/net/rtl8139.c
|
|
|
b2d9fb |
+++ b/hw/net/rtl8139.c
|
|
|
b2d9fb |
@@ -2202,6 +2202,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
|
|
|
b2d9fb |
|
|
|
b2d9fb |
if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP)
|
|
|
b2d9fb |
{
|
|
|
b2d9fb |
+ /* Large enough for the TCP header? */
|
|
|
b2d9fb |
+ if (ip_data_len < sizeof(tcp_header)) {
|
|
|
b2d9fb |
+ goto skip_offload;
|
|
|
b2d9fb |
+ }
|
|
|
b2d9fb |
+
|
|
|
b2d9fb |
int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK;
|
|
|
b2d9fb |
|
|
|
b2d9fb |
DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d "
|
|
|
b2d9fb |
--
|
|
|
b2d9fb |
1.8.3.1
|
|
|
b2d9fb |
|