summaryrefslogtreecommitdiffstats
path: root/drivers/char/virtio_console.c
diff options
context:
space:
mode:
authorAmit Shah2013-08-07 08:24:17 +0200
committerRusty Russell2013-08-09 05:32:16 +0200
commit3b868a4073cdedf395f26d843874414e0e0e9cfd (patch)
treec61396970bcaa517abe6511dda51914737a8dfd3 /drivers/char/virtio_console.c
parentMerge branch 'master' into virtio-next (diff)
downloadkernel-qcow2-linux-3b868a4073cdedf395f26d843874414e0e0e9cfd.tar.gz
kernel-qcow2-linux-3b868a4073cdedf395f26d843874414e0e0e9cfd.tar.xz
kernel-qcow2-linux-3b868a4073cdedf395f26d843874414e0e0e9cfd.zip
virtio: console: prevent use-after-free of port name in port unplug
Remove the debugfs path before freeing port->name, to prevent a possible use-after-free. Reported-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/virtio_console.c')
-rw-r--r--drivers/char/virtio_console.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index d0e75aa904ac..b79cf3e1b793 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1591,9 +1591,8 @@ static void unplug_port(struct port *port)
device_destroy(pdrvdata.class, port->dev->devt);
cdev_del(port->cdev);
- kfree(port->name);
-
debugfs_remove(port->debugfs_file);
+ kfree(port->name);
/*
* Locks around here are not necessary - a port can't be