Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
commit160e5c22e55b3f775c2003dfc626fa872ee4a7a1
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 9 Nov 2018 10:54:10 +0000 (9 10:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 9 Nov 2018 10:54:10 +0000 (9 10:54 +0000)
treebd6d3255d4b23ed41a9b3aa9fe2200df55b463c1
parentd3c2bbb166f8cd840a3f4efec31d55485f1360ed
parent5b76ef50f62079a2389ba28cacaf6cce68b1a0ed
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

Fixes a potential use-after-free issue that could be triggered by a
misbehaving guest.

# gpg: Signature made Thu 08 Nov 2018 20:36:48 GMT
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  9p: write lock path in v9fs_co_open2()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>