summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-12 00:10:23 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-12 00:10:23 +0300
commit6da7e95326976c0bee625f642e1c8ffa970efa07 (patch)
treea7e61e93661331fe3114328bd81a9113285436f2 /net
parent3b3ce01a57ad45d1ea4c63012d6f1e740d151d8d (diff)
parent3b2fbb3f06efe5bd2dfdce2a1db703e23c1a78af (diff)
downloadlinux-6da7e95326976c0bee625f642e1c8ffa970efa07.tar.xz
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes and cleanups from Michael Tsirkin: "Misc fixes and cleanups all over the place" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio/s390: deprecate old transport virtio/s390: keep early_put_chars virtio_blk: Fix a slient kernel panic virtio-vsock: fix include guard typo vhost/vsock: fix vhost virtio_vsock_pkt use-after-free 9p/trans_virtio: use kvfree() for iov_iter_get_pages_alloc() virtio: fix error handling for debug builds virtio: fix memory leak in virtqueue_add()
Diffstat (limited to 'net')
-rw-r--r--net/9p/trans_virtio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 4acb1d5417aa..f24b25c25106 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -507,8 +507,8 @@ err_out:
/* wakeup anybody waiting for slots to pin pages */
wake_up(&vp_wq);
}
- kfree(in_pages);
- kfree(out_pages);
+ kvfree(in_pages);
+ kvfree(out_pages);
return err;
}