Commit 22dbfdec authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20191010.0' into staging 



VFIO update 2019-10-10

 - Fix MSI error path double free (Evgeny Yakovlev)

# gpg: Signature made Thu 10 Oct 2019 20:07:39 BST
# gpg:                using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-update-20191010.0:
  hw/vfio/pci: fix double free in vfio_msi_disable

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c8b2bc51 d964d3b5

hw/vfio/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ retry: 
        }



        g_free(vdev->msi_vectors);

        vdev->msi_vectors = NULL;



        if (ret > 0 && ret != vdev->nr_vectors) {

            vdev->nr_vectors = ret;