Merge remote-tracking branch 'remotes/stefanha/tags/rtl8139-cplus-tx-input-validation...
commit2a3612ccc1fa9cea77bd193afbfe21c77e7e91ef
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Aug 2015 12:09:10 +0000 (3 13:09 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Aug 2015 12:09:10 +0000 (3 13:09 +0100)
tree49b4eda59c814c477f8dcb12b70babc8d4ebce0f
parentbd80b5963f58c601f31d3186b89887bf8e182fb5
parent8357946b15f0a31f73dd691b7da95f29318ed310
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* 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 <peter.maydell@linaro.org>