summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2019-08-02 14:06:03 +0200
committerPeter Maydell2019-08-02 14:06:03 +0200
commit9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59 (patch)
tree02b69a7d3f1c62825ba901c2091091a73447a5e3
parentUpdate version for v4.1.0-rc3 release (diff)
parentslirp: update with CVE-2019-14378 fix (diff)
downloadqemu-9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59.tar.gz
qemu-9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59.tar.xz
qemu-9bcf2dfa163f67b0fec6ee0fe88ad5dc5d69dc59.zip
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request' into staging
Slirp CVE-2019-14378 pull request # gpg: Signature made Fri 02 Aug 2019 12:17:24 BST # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/elmarco/tags/slirp-CVE-2019-14378-pull-request: slirp: update with CVE-2019-14378 fix Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
m---------slirp0
1 files changed, 0 insertions, 0 deletions
diff --git a/slirp b/slirp
-Subproject f0da6726207b740f6101028b2992f918477a4b0
+Subproject 126c04acbabd7ad32c2b018fe10dfac2a3bc121