CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Jan 10 03:07:25 UTC 2016

Modified Files:
        src/sys/dev/pci: virtio.c

Log Message:
PR/50636: Ryo ONODERA: Fix incorrect kmem_free()


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/virtio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.13 src/sys/dev/pci/virtio.c:1.14
--- src/sys/dev/pci/virtio.c:1.13	Fri Oct 30 16:38:31 2015
+++ src/sys/dev/pci/virtio.c	Sat Jan  9 22:07:25 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.13 2015/10/30 20:38:31 christos Exp $	*/
+/*	$NetBSD: virtio.c,v 1.14 2016/01/10 03:07:25 christos Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.13 2015/10/30 20:38:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.14 2016/01/10 03:07:25 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -942,7 +942,7 @@ virtio_free_vq(struct virtio_softc *sc, 
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh,
 			  VIRTIO_CONFIG_QUEUE_ADDRESS, 0);
 
-	kmem_free(vq->vq_entries, vq->vq_bytesize);
+	kmem_free(vq->vq_entries, sizeof(*vq->vq_entries) * vq->vq_num);
 	bus_dmamap_unload(sc->sc_dmat, vq->vq_dmamap);
 	bus_dmamap_destroy(sc->sc_dmat, vq->vq_dmamap);
 	bus_dmamem_unmap(sc->sc_dmat, vq->vq_vaddr, vq->vq_bytesize);