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

misbehaving guest.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEtIKLr5QxQM7yo0kQcdTV5YIvc9YFAlvknmAACgkQcdTV5YIv
 c9b5bQ/+MXI5a2ZA+Rysz0RGFjzMm5u9dB88v/M9957I0XZ0VVPw3pA6xlWKIZRi
 gvD/x47tJRi3bx1KLZcUNxsF1LtcmrbBk8DFith/bWqetXs78LolyzTjR0si51ue
 ObVWKBiWsQlODxoCXuq4tjHj0RcQ7G9slj33CxvUop3FvBib2tbVRBi64XvukzKw
 MhDsb6T6lI8W65ZUPL86IMildpLM4TzACwjn+TGHUBbFc9xeK6i/3Vf4bUZzQc4j
 uCCyxqWHsQPzXclaGz2JbOKa9u/N35IEeBSez75kTZs2M9rHBosgJq/EG6Qqr6gV
 ISHVDJN4bnjvVtiSr74aIE9cMa0Goj8V5RbpdJKttt4+gnZ4csniKyVfz7B6xEIb
 AYCuNGvosWdzCsm97GK1MHUJkuzZUDR70dTtJhfUgRUWTSwYf3ol6TPyr0u+cNvu
 ymCg//cGxW2S3KgrlloRP2vJPlecjoH5tXkN6p31JWAONevav/85JSUqiqX5L+p9
 chnKoZeJy6Ow4KpgM6vS7tFP2kT2uTIOq1bQUt6CAm+pRJfv9LJLf3YbQ61ynlIm
 SnMdTG607hx8bQCathEW6kIu7cagdHfGgawts4EK5CdsdHpbQpttksQrXBVx7mW2
 XfkpZGsUefbSkYI56+g12GzbgIx/0i//1tDTdEv9cXqHApMGiR4=
 =XOsI
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-11-09 10:54:10 +00:00
commit 160e5c22e5

View File

@ -140,10 +140,10 @@ int coroutine_fn v9fs_co_open2(V9fsPDU *pdu, V9fsFidState *fidp,
cred.fc_gid = gid;
/*
* Hold the directory fid lock so that directory path name
* don't change. Read lock is fine because this fid cannot
* be used by any other operation.
* don't change. Take the write lock to be sure this fid
* cannot be used by another operation.
*/
v9fs_path_read_lock(s);
v9fs_path_write_lock(s);
v9fs_co_run_in_worker(
{
err = s->ops->open2(&s->ctx, &fidp->path,