fix a kmap leak in virtio_console

While we are at it, don't do kmap() under kmap_atomic(), *especially*
for a page we'd allocated with GFP_KERNEL. It's spelled "page_address",
and had that been more than that, we'd have a real trouble - kmap_high()
can block, and doing that while holding kmap_atomic() is a Bad Idea(tm).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro c9efe511 d311d79d

+3 -6
+3 -6
drivers/char/virtio_console.c
··· 890 } else { 891 /* Failback to copying a page */ 892 struct page *page = alloc_page(GFP_KERNEL); 893 - char *src = buf->ops->map(pipe, buf, 1); 894 - char *dst; 895 896 if (!page) 897 return -ENOMEM; 898 - dst = kmap(page); 899 900 offset = sd->pos & ~PAGE_MASK; 901 ··· 901 if (len + offset > PAGE_SIZE) 902 len = PAGE_SIZE - offset; 903 904 - memcpy(dst + offset, src + buf->offset, len); 905 - 906 - kunmap(page); 907 buf->ops->unmap(pipe, buf, src); 908 909 sg_set_page(&(sgl->sg[sgl->n]), page, len, offset);
··· 890 } else { 891 /* Failback to copying a page */ 892 struct page *page = alloc_page(GFP_KERNEL); 893 + char *src; 894 895 if (!page) 896 return -ENOMEM; 897 898 offset = sd->pos & ~PAGE_MASK; 899 ··· 903 if (len + offset > PAGE_SIZE) 904 len = PAGE_SIZE - offset; 905 906 + src = buf->ops->map(pipe, buf, 1); 907 + memcpy(page_address(page) + offset, src + buf->offset, len); 908 buf->ops->unmap(pipe, buf, src); 909 910 sg_set_page(&(sgl->sg[sgl->n]), page, len, offset);