shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fs: Allow a NULL pos pointer to __kernel_read"

Browse Source 
This reverts commit 7b84b665c8.

Bug: 171770067
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibd2082a7f7e84974f0ce52814553f22e493cfcbf
This commit is contained in:
Greg Kroah-Hartman
2020-10-27 10:20:17 +01:00
parent 8996419960
commit aeffda3c61
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/read_write.c
View File

@@ -449,12 +449,11 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
return warn_unsupported(file, "read");
init_sync_kiocb(&kiocb, file);
kiocb.ki_pos = pos ? *pos : 0;
kiocb.ki_pos = *pos;
iov_iter_kvec(&iter, READ, &iov, 1, iov.iov_len);
ret = file->f_op->read_iter(&kiocb, &iter);
if (ret > 0) {
if (pos)
*pos = kiocb.ki_pos;
*pos = kiocb.ki_pos;
fsnotify_access(file);
add_rchar(current, ret);
}