Skip to content

Commit

Permalink
/dev/zero: fixups for ->read
Browse files Browse the repository at this point in the history
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: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20200907082700.2057137-1-hch@lst.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Christoph Hellwig authored and Greg Kroah-Hartman committed Sep 7, 2020
1 parent 947bece commit ab04de8
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/char/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit ab04de8

Please sign in to comment.