[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PULL for-2.4 3/7] rtl8139: skip offload on short Ethernet
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-stable] [PULL for-2.4 3/7] rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165) |
Date: |
Mon, 3 Aug 2015 13:08:37 +0100 |
Transmit offload features access Ethernet and IP headers the packet. If
the packet is too short we must not attempt to access header fields:
int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12));
...
eth_payload_data = saved_buffer + ETH_HLEN;
...
ip = (ip_header*)eth_payload_data;
if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) {
Reported-by: 朱东海(启路) <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/net/rtl8139.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index db36b65..1c62076 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -2150,6 +2150,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
{
DPRINTF("+++ C+ mode offloaded task checksum\n");
+ /* Large enough for Ethernet and IP headers? */
+ if (saved_size < ETH_HLEN + sizeof(ip_header)) {
+ goto skip_offload;
+ }
+
/* ip packet header */
ip_header *ip = NULL;
int hlen = 0;
--
2.4.3
- [Qemu-stable] [PULL for-2.4 0/7] Rtl8139 cplus tx input validation patches, Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 6/7] rtl8139: skip offload on short TCP header (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 4/7] rtl8139: check IP Header Length field (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 1/7] rtl8139: avoid nested ifs in IP header parsing (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 5/7] rtl8139: check IP Total Length field (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 3/7] rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165),
Stefan Hajnoczi <=
- [Qemu-stable] [PULL for-2.4 2/7] rtl8139: drop tautologous if (ip) {...} statement (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- [Qemu-stable] [PULL for-2.4 7/7] rtl8139: check TCP Data Offset field (CVE-2015-5165), Stefan Hajnoczi, 2015/08/03
- Re: [Qemu-stable] [PULL for-2.4 0/7] Rtl8139 cplus tx input validation patches, Peter Maydell, 2015/08/03