---

yaml --- r: 347470 b: refs/heads/master c: fe52953 h: refs/heads/master v: v3
git-mirror · Dec 18, 2012 · 7f02c43 · 7f02c43
1 parent e92aa09
commit 7f02c43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }