From b5300621a650a104e4ceb07489b11e8f9bd36ca8 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Mon, 30 Jul 2012 14:40:08 -0700
Subject: [PATCH] --- yaml --- r: 319898 b: refs/heads/master c:
 cdf53441368cc02ee4aa8a8343a5dc25132836f0 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aee5a6312df9..e50cbca25253 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5353cf089bb32b69a7515be909c14bf05fe2e81e
+refs/heads/master: cdf53441368cc02ee4aa8a8343a5dc25132836f0
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 50c96b5651b6..852269adad25 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -389,8 +389,10 @@ static ssize_t devkmsg_writev(struct kiocb *iocb, const struct iovec *iv,
 
 	line = buf;
 	for (i = 0; i < count; i++) {
-		if (copy_from_user(line, iv[i].iov_base, iv[i].iov_len))
+		if (copy_from_user(line, iv[i].iov_base, iv[i].iov_len)) {
+			ret = -EFAULT;
 			goto out;
+		}
 		line += iv[i].iov_len;
 	}