diff options
| author | Peter Maydell | 2017-08-10 18:50:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-10 18:50:55 +0200 |
| commit | 473a321122fd3c2c327a5a5d01a9a41f26f1734c (patch) | |
| tree | 31dc8f1adcd726b7a08d92c057a6ee91d15a88f0 /qobject/json-streamer.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' int... (diff) | |
| parent | 9pfs: local: fix fchmodat_nofollow() limitations (diff) | |
| download | qemu-473a321122fd3c2c327a5a5d01a9a41f26f1734c.tar.gz qemu-473a321122fd3c2c327a5a5d01a9a41f26f1734c.tar.xz qemu-473a321122fd3c2c327a5a5d01a9a41f26f1734c.zip | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
Just a single fix for an annoying regression introduced in 2.9 when fixing
CVE-2016-9602.
# gpg: Signature made Thu 10 Aug 2017 13:40:28 BST
# gpg: using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg: aka "Greg Kurz <groug@free.fr>"
# gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg: aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg: aka "[jpeg image of size 3330]"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2
* remotes/gkurz/tags/for-upstream:
9pfs: local: fix fchmodat_nofollow() limitations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-streamer.c')
0 files changed, 0 insertions, 0 deletions