diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-07-15 17:39:29 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-08-04 12:34:00 -0500 |
| commit | 35c30d3efdfb7d06f978cdb711cb27bc280dcbe8 (patch) | |
| tree | 94e2a6609fc00838372f0085e1907fe0f7fa590f | |
| parent | f4c861fd68838649e81e0f9a6d75b154fda76440 (diff) | |
| download | qemu-35c30d3efdfb7d06f978cdb711cb27bc280dcbe8.zip qemu-35c30d3efdfb7d06f978cdb711cb27bc280dcbe8.tar.gz qemu-35c30d3efdfb7d06f978cdb711cb27bc280dcbe8.tar.bz2 | |
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>
(cherry picked from commit 8357946b15f0a31f73dd691b7da95f29318ed310)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/net/rtl8139.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index efde7b4..d25e8c9 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; |