From: Peter Maydell Date: Thu, 11 Jun 2020 20:19:29 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-06-09-v2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f1f264edbdf5516d6f208497310b3eedbc7b74c;p=qemu.git Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-06-09-v2' into staging NBD patches for 2020-06-09 - fix iotest 194 race - fix CVE-2020-10761: server DoS from assertion on long NBD error messages # gpg: Signature made Wed 10 Jun 2020 18:59:19 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake " [full] # gpg: aka "Eric Blake (Free Software Programmer) " [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2020-06-09-v2: block: Call attention to truncation of long NBD exports nbd/server: Avoid long error message assertions CVE-2020-10761 iotests: 194: wait for migration completion on target too Signed-off-by: Peter Maydell --- 9f1f264edbdf5516d6f208497310b3eedbc7b74c