---

yaml --- r: 63101 b: refs/heads/master c: 2b3d8c9 h: refs/heads/master i: 63099: 3060b5d v: v3
git-mirror · Jul 27, 2007 · 1310492 · 1310492
1 parent bc67b0f
commit 1310492
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a8e0c8d9af43c9dfc62a8b2b9cc0484f48f7da4
+refs/heads/master: 2b3d8c9e06392d5539aa5d652f3a3c385fd19333
diff --git a/trunk/drivers/s390/char/vmur.c b/trunk/drivers/s390/char/vmur.c
@@ -486,7 +486,7 @@ static ssize_t diag14_read(struct file *file, char __user *ubuf, size_t count,
 		}
 		if (rc)
 			goto fail;
-		if (reclen)
+		if (reclen && (copied == 0) && (*offs < PAGE_SIZE))
 			*((u16 *) &buf[FILE_RECLEN_OFFSET]) = reclen;
 		len = min(count - copied, PAGE_SIZE - res);
 		if (copy_to_user(ubuf + copied, buf + res, len)) {