| From 6e161d6fe6ae7397abe82ed347f6f64aaa447e86 Mon Sep 17 00:00:00 2001 |
| From: Omar Sandoval <osandov@fb.com> |
| Date: Wed, 1 Feb 2017 00:02:27 -0800 |
| Subject: [PATCH] virtio-console: avoid DMA from stack |
| |
| commit c4baad50297d84bde1a7ad45e50c73adae4a2192 upstream. |
| |
| put_chars() stuffs the buffer it gets into an sg, but that buffer may be |
| on the stack. This breaks with CONFIG_VMAP_STACK=y (for me, it |
| manifested as printks getting turned into NUL bytes). |
| |
| Signed-off-by: Omar Sandoval <osandov@fb.com> |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| Reviewed-by: Amit Shah <amit.shah@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c |
| index 4aae0d27e382..d87f3e72c5fb 100644 |
| --- a/drivers/char/virtio_console.c |
| +++ b/drivers/char/virtio_console.c |
| @@ -1137,6 +1137,8 @@ static int put_chars(u32 vtermno, const char *buf, int count) |
| { |
| struct port *port; |
| struct scatterlist sg[1]; |
| + void *data; |
| + int ret; |
| |
| if (unlikely(early_put_chars)) |
| return early_put_chars(vtermno, buf, count); |
| @@ -1145,8 +1147,14 @@ static int put_chars(u32 vtermno, const char *buf, int count) |
| if (!port) |
| return -EPIPE; |
| |
| - sg_init_one(sg, buf, count); |
| - return __send_to_port(port, sg, 1, count, (void *)buf, false); |
| + data = kmemdup(buf, count, GFP_ATOMIC); |
| + if (!data) |
| + return -ENOMEM; |
| + |
| + sg_init_one(sg, data, count); |
| + ret = __send_to_port(port, sg, 1, count, data, false); |
| + kfree(data); |
| + return ret; |
| } |
| |
| /* |
| -- |
| 2.12.0 |
| |