OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix for CVE-2021-20181 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEtIKLr5QxQM7yo0kQcdTV5YIvc9YFAmABV8MACgkQcdTV5YIv
 c9ZvoRAAhXHnUohiHaWPN5DnI+7QmE0QZnCg1nVqIj0SEg0Y8UF0hdYLc+IjPopn
 3GKGq3If9qthWmnJQNi2gMWsQwMmlLqwYz20yq1mLtIyrjCt3ltnBp3hxEZCOZDR
 9VoSXr7JevdXNwdQ0dn0EKAF9snaRCwq59aNJdJ/MWy+6c+x8OHTv/Rb9shKBbDA
 5cakEsWN0RLa4He97f7A6y5wBZ7RN6OaFM03x1XdBmXaqt+zzvHQXmlls/eU17eX
 AwfTXiBj2V3hWyRo6MY2asoSB2aBHSvP405Bqi4VBki0VkEwT84geMi2VMfDV7dV
 YI2AYxyWPyxLv07tMaiw4Py/5trZS1QHFJmVFR9AhE5wJolkREmXDgESbijqhxPy
 Z2G8+ohR1twdc2HbfVnAW8oHhAIhKD3QkdD/y4p/NW62wjGOWc4maCysFMvBvQyE
 hI+aK10mNsPaRh0pUs9NrQAUwdm2DUlVPGMn8mEEo9EskPlNYU/9ojzrv1nzCDC1
 eNY8w3UaYIFGHwqqceJ49tj3MtDEpEWcogWURTs/8u2OyTciA+ojHlmfJiCX1SnF
 KHGSXQn9SWrpY5+Q/Pdp3xIri0i79CX4ei3x4XBoD/PeB1hz5TGtfV9fhR5dl6SY
 mBgC4sP5+dDAva+ts+UfLzgT2lf/Rji9kr8R2hIhJ6gQTILMbSU=
 =/6sh
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/gkurz-gitlab/tags/9p-next-2021-01-15' into staging

Fix for CVE-2021-20181

# gpg: Signature made Fri 15 Jan 2021 08:52:19 GMT
# gpg:                using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full]
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>" [full]
# gpg:                 aka "[jpeg image of size 3330]" [full]
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz-gitlab/tags/9p-next-2021-01-15:
  9pfs: Fully restart unreclaim loop (CVE-2021-20181)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-01-15 15:32:05 +00:00
parent 256af05f52 89fbea8737
commit a968a38005
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/9pfs/9p.c
View File

@ -502,9 +502,9 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path)
{
int err;
V9fsState *s = pdu->s;
V9fsFidState *fidp, head_fid;
V9fsFidState *fidp;
head_fid.next = s->fid_list;
again:
for (fidp = s->fid_list; fidp; fidp = fidp->next) {
if (fidp->path.size != path->size) {
continue;
@ -524,7 +524,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path)
* switched to the worker thread
*/
if (err == 0) {
fidp = &head_fid;
goto again;
}
}
}