[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PULL for-2.4 7/7] rtl8139: check TCP Data Offset field (C
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-stable] [PULL for-2.4 7/7] rtl8139: check TCP Data Offset field (CVE-2015-5165) |
Date: |
Mon, 3 Aug 2015 13:08:41 +0100 |
The TCP Data Offset field contains the length of the header. Make sure
it is valid and does not exceed the IP data length.
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 fa01934..edbb61c 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -2239,6 +2239,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr);
+ /* Invalid TCP data offset? */
+ if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) {
+ goto skip_offload;
+ }
+
/* ETH_MTU = ip header len + tcp header len + payload */
int tcp_data_len = ip_data_len - tcp_hlen;
int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen;
--
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, 2015/08/03
- [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 <=
- Re: [Qemu-stable] [PULL for-2.4 0/7] Rtl8139 cplus tx input validation patches, Peter Maydell, 2015/08/03