From 7f02c43da90315394b34e3a9a3b6787c681d7064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Date: Mon, 15 Oct 2012 09:57:33 +0200 Subject: [PATCH] --- yaml --- r: 347470 b: refs/heads/master c: fe5295374ec9ac56ba3b619c5c1792b3fd66d859 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f10156e5008d..90643e1a26e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de929b04450f2ec984c2febb1249d0e0f993d0a2 +refs/heads/master: fe5295374ec9ac56ba3b619c5c1792b3fd66d859 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 6a369942da84..09d193dbb233 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -881,6 +881,8 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe, if (likely(ret > 0)) ret = send_pages(port, sgl.sg, sgl.n, sgl.len, true); + if (unlikely(ret <= 0)) + kfree(sgl.sg); return ret; }