From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMEY1-0002Rd-Np for qemu-devel@nongnu.org; Mon, 03 Aug 2015 08:08:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMEXx-0008IW-L1 for qemu-devel@nongnu.org; Mon, 03 Aug 2015 08:08:53 -0400 From: Stefan Hajnoczi Date: Mon, 3 Aug 2015 13:08:37 +0100 Message-Id: <1438603721-28320-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1438603721-28320-1-git-send-email-stefanha@redhat.com> References: <1438603721-28320-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.4 3/7] rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , qemu-stable@nongnu.org, Stefan Hajnoczi 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 =3D be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); ... eth_payload_data =3D saved_buffer + ETH_HLEN; ... ip =3D (ip_header*)eth_payload_data; if (IP_HEADER_VERSION(ip) !=3D IP_HEADER_VERSION_4) { Reported-by: =E6=9C=B1=E4=B8=9C=E6=B5=B7(=E5=90=AF=E8=B7=AF) Reviewed-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- 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"); =20 + /* Large enough for Ethernet and IP headers? */ + if (saved_size < ETH_HLEN + sizeof(ip_header)) { + goto skip_offload; + } + /* ip packet header */ ip_header *ip =3D NULL; int hlen =3D 0; --=20 2.4.3