Commit 122e6d2a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/gkurz/tags/9p-fix-2019-11-23' into staging 



9pfs fixes for QEMU 4.2

This fixes a potential QEMU crash if the underlying filesystem returns
a null block size in statfs().

# gpg: Signature made Sat 23 Nov 2019 15:19:36 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/tags/9p-fix-2019-11-23:
  9pfs: Fix divide by zero bug

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2061735f 68d654da

hw/9pfs/9p.c

+4 −2
Original line number Diff line number Diff line
@@ -1834,9 +1834,11 @@ static int32_t coroutine_fn get_iounit(V9fsPDU *pdu, V9fsPath *path) 
     * and as well as less than (client msize - P9_IOHDRSZ))

     */

    if (!v9fs_co_statfs(pdu, path, &stbuf)) {

        if (stbuf.f_bsize) {

            iounit = stbuf.f_bsize;

            iounit *= (s->msize - P9_IOHDRSZ) / stbuf.f_bsize;

        }

    }

    if (!iounit) {

        iounit = s->msize - P9_IOHDRSZ;

    }