diff options
| author | Matthew Wilcox <mawilcox@microsoft.com> | 2018-06-07 16:57:15 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2018-06-13 01:19:22 +0200 |
| commit | 5b572e25c3649235969e4ada67cde27b5bb24979 (patch) | |
| tree | 404a3135e0eb76e9c0657e6cabaa000b3781d985 | |
| parent | test_overflow: fix an IS_ERR() vs NULL bug (diff) | |
| download | linux-5b572e25c3649235969e4ada67cde27b5bb24979.tar.xz linux-5b572e25c3649235969e4ada67cde27b5bb24979.zip | |
Convert virtio_console to struct_size
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | drivers/char/virtio_console.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 21085515814f..4bf7c06c2343 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -433,8 +433,7 @@ static struct port_buffer *alloc_buf(struct virtio_device *vdev, size_t buf_size * Allocate buffer and the sg list. The sg list array is allocated * directly after the port_buffer struct. */ - buf = kmalloc(sizeof(*buf) + sizeof(struct scatterlist) * pages, - GFP_KERNEL); + buf = kmalloc(struct_size(buf, sg, pages), GFP_KERNEL); if (!buf) goto fail; |