Commit ab04de8e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman

/dev/zero: fixups for ->read

Reported the cleared bytes in case of a partial clear_user instead
of -EFAULT, and remove a pointless conditional, as cleared must be
non-zero by the time we hit the signal_pending check.
Reported-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20200907082700.2057137-1-hch@lst.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 947bece1
......@@ -733,14 +733,20 @@ static ssize_t read_zero(struct file *file, char __user *buf,
while (count) {
size_t chunk = min_t(size_t, count, PAGE_SIZE);
size_t left;
if (clear_user(buf + cleared, chunk))
return cleared ? cleared : -EFAULT;
left = clear_user(buf + cleared, chunk);
if (unlikely(left)) {
cleared += (chunk - left);
if (!cleared)
return -EFAULT;
break;
}
cleared += chunk;
count -= chunk;
if (signal_pending(current))
return cleared ? cleared : -ERESTARTSYS;
break;
cond_resched();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment