summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2020-11-27 18:09:55 +0100
committerPeter Maydell2020-11-27 18:09:55 +0100
commit944fdc5e27a5b5adbb765891e8e70e88ba9a00ec (patch)
treedbc063a4ec7f1f4636dd807629de6d5157569b57
parentMerge remote-tracking branch 'remotes/kraxel/tags/fixes-20201127-pull-request... (diff)
parentslirp: update to fix CVE-2020-29129 CVE-2020-29130 (diff)
downloadqemu-944fdc5e27a5b5adbb765891e8e70e88ba9a00ec.tar.gz
qemu-944fdc5e27a5b5adbb765891e8e70e88ba9a00ec.tar.xz
qemu-944fdc5e27a5b5adbb765891e8e70e88ba9a00ec.zip
Merge remote-tracking branch 'remotes/elmarco/tags/libslirp-pull-request' into staging
# gpg: Signature made Fri 27 Nov 2020 17:06:28 GMT # 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/libslirp-pull-request: slirp: update to fix CVE-2020-29129 CVE-2020-29130 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 ce94eba2042d52a0ba3d9e252ebce86715e9427
+Subproject 8f43a99191afb47ca3f3c6972f6306209f367ec