From e4a15e8dacfecc02abd4d6bf0012307cee686ad3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Oct 2020 10:20:19 +0100 Subject: [PATCH] Revert "fs: Allow a NULL pos pointer to __kernel_write" This reverts commit 4c207ef48269377236cd38979197c5e1631c8c16. Bug: 171770067 Signed-off-by: Greg Kroah-Hartman Change-Id: I7d39528e90ec94e76864d2dd4f6666595851dfbf --- fs/read_write.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index d1db89fc6f67..334252c60fe9 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -544,12 +544,11 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t return warn_unsupported(file, "write"); init_sync_kiocb(&kiocb, file); - kiocb.ki_pos = pos ? *pos : 0; + kiocb.ki_pos = *pos; iov_iter_kvec(&iter, WRITE, &iov, 1, iov.iov_len); ret = file->f_op->write_iter(&kiocb, &iter); if (ret > 0) { - if (pos) - *pos = kiocb.ki_pos; + *pos = kiocb.ki_pos; fsnotify_modify(file); add_wchar(current, ret); }