From a3cb2e4ce470cbaef81b472d4134b965d4166a65 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Oct 2020 15:07:57 +0100 Subject: [PATCH] Revert "Revert "fs: Allow a NULL pos pointer to __kernel_write"" This reverts commit e4a15e8dacfecc02abd4d6bf0012307cee686ad3. Bug: 171770067 Signed-off-by: Greg Kroah-Hartman Change-Id: I27032f9ebe8fcddd98416ddabe34f554db545eae --- fs/read_write.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 25fb21bc00f7..5d731929259d 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -544,11 +544,12 @@ 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; + kiocb.ki_pos = pos ? *pos : 0; iov_iter_kvec(&iter, WRITE, &iov, 1, iov.iov_len); ret = file->f_op->write_iter(&kiocb, &iter); if (ret > 0) { - *pos = kiocb.ki_pos; + if (pos) + *pos = kiocb.ki_pos; fsnotify_modify(file); add_wchar(current, ret); }