diff options
| author | Brian Behlendorf <[email protected]> | 2020-12-20 09:49:29 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-20 09:49:29 -0800 |
| commit | 9ac535e66277a8d874434e1e81da8adb266d9692 (patch) | |
| tree | c31a0fd97f300932842bb899b5ac5444f32b5c25 | |
| parent | 49c482fde366e0cd2d2c164c8339669ba88fe108 (diff) | |
Remove iov_iter_advance() from iter_read
There's no need to call iov_iter_advance() in zpl_iter_read().
This was preserved from the previous code where it wasn't needed
but also didn't cause any problems. Now that the iter functions
also handle pipes that's no longer the case. When fully reading a
pipe buffer iov_iter_advance() may results in the pipe buf release
function being called which will not be registered resulting in
a NULL dereference.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #11375
Closes #11378
| -rw-r--r-- | module/os/linux/zfs/zpl_file.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c index d6bc84009..6e1b182eb 100644 --- a/module/os/linux/zfs/zpl_file.c +++ b/module/os/linux/zfs/zpl_file.c @@ -282,9 +282,6 @@ zpl_iter_read(struct kiocb *kiocb, struct iov_iter *to) zpl_file_accessed(filp); - if (read > 0) - iov_iter_advance(to, read); - return (read); } |