---

yaml --- r: 319898 b: refs/heads/master c: cdf5344 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · b530062 · b530062
1 parent b6d7935
commit b530062
Show file tree

Hide file tree

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