summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-07-15 17:39:29 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2015-08-03 13:08:10 +0100
commit8357946b15f0a31f73dd691b7da95f29318ed310 (patch)
tree02232380bcf1f78ad68f036a6a98282fe03c77c2
parent4240be45632db7831129f124bcf53c1223825b0f (diff)
downloadqemu-8357946b15f0a31f73dd691b7da95f29318ed310.tar.gz
qemu-8357946b15f0a31f73dd691b7da95f29318ed310.tar.bz2
qemu-8357946b15f0a31f73dd691b7da95f29318ed310.zip
rtl8139: check TCP Data Offset field (CVE-2015-5165)
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: 朱东海(启路) <donghai.zdh@alibaba-inc.com> Reviewed-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--hw/net/rtl8139.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index fa0193403e..edbb61ccf3 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;