|
 |
9ae3a8 |
From 87c927af369a24b466b9429e9c785219ea718863 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 31 Jul 2015 15:59:44 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 09/13] rtl8139: skip offload on short Ethernet/IP header
|
|
|
9ae3a8 |
(CVE-2015-5165)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1438358388-10575-4-git-send-email-stefanha@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 67237
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1.z qemu-kvm EMBARGOED PATCH 3/7] rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165)
|
|
|
9ae3a8 |
Bugzilla: 1248766
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Transmit offload features access Ethernet and IP headers the packet. If
|
|
|
9ae3a8 |
the packet is too short we must not attempt to access header fields:
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12));
|
|
|
9ae3a8 |
...
|
|
|
9ae3a8 |
eth_payload_data = saved_buffer + ETH_HLEN;
|
|
|
9ae3a8 |
...
|
|
|
9ae3a8 |
ip = (ip_header*)eth_payload_data;
|
|
|
9ae3a8 |
if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/net/rtl8139.c | 5 +++++
|
|
|
9ae3a8 |
1 file changed, 5 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
|
|
|
9ae3a8 |
index ab32714..409029d 100644
|
|
|
9ae3a8 |
--- a/hw/net/rtl8139.c
|
|
|
9ae3a8 |
+++ b/hw/net/rtl8139.c
|
|
|
9ae3a8 |
@@ -2142,6 +2142,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
DPRINTF("+++ C+ mode offloaded task checksum\n");
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ /* Large enough for Ethernet and IP headers? */
|
|
|
9ae3a8 |
+ if (saved_size < ETH_HLEN + sizeof(ip_header)) {
|
|
|
9ae3a8 |
+ goto skip_offload;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
/* ip packet header */
|
|
|
9ae3a8 |
ip_header *ip = NULL;
|
|
|
9ae3a8 |
int hlen = 0;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|