From: Peter Maydell Date: Mon, 3 Aug 2015 12:09:10 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/rtl8139-cplus-tx-input-validation... X-Git-Tag: qemu-xen-4.7.0-rc1~126 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2a3612ccc1fa9cea77bd193afbfe21c77e7e91ef;p=qemu-xen.git Merge remote-tracking branch 'remotes/stefanha/tags/rtl8139-cplus-tx-input-validation-pull-request' into staging Pull request # gpg: Signature made Mon Aug 3 13:08:25 2015 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/rtl8139-cplus-tx-input-validation-pull-request: rtl8139: check TCP Data Offset field (CVE-2015-5165) rtl8139: skip offload on short TCP header (CVE-2015-5165) rtl8139: check IP Total Length field (CVE-2015-5165) rtl8139: check IP Header Length field (CVE-2015-5165) rtl8139: skip offload on short Ethernet/IP header (CVE-2015-5165) rtl8139: drop tautologous if (ip) {...} statement (CVE-2015-5165) rtl8139: avoid nested ifs in IP header parsing (CVE-2015-5165) Signed-off-by: Peter Maydell --- 2a3612ccc1fa9cea77bd193afbfe21c77e7e91ef