netfs: Fix NULL pointer dereference in netfs_unbuffered_write() on retry
Subsystems (2)
PATCH 1/1 netfs: Fix NULL pointer dereference in netfs_unbuffered_write() on retry
When a write subrequest is marked NETFS_SREQ_NEED_RETRY, the retry path in netfs_unbuffered_write() unconditionally calls stream->prepare_write() without checking if it is NULL.
Filesystems such as 9P do not set the prepare_write operation, so stream->prepare_write remains NULL. When get_user_pages() fails with -EFAULT and the subrequest is flagged for retry, this results in a NULL pointer dereference at fs/netfs/direct_write.c:189.
Fix this by mirroring the pattern already used in write_retry.c: if stream->prepare_write is NULL, skip renegotiation and directly reissue the subrequest via netfs_reissue_write(), which handles iterator reset, IN_PROGRESS flag, stats update and reissue internally.
--- fs/netfs/direct_write.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/netfs/direct_write.c +11 -3
@@ -186,10 +186,18 @@ static int netfs_unbuffered_write(struct netfs_io_request *wreq) stream->sreq_max_segs =INT_MAX ;netfs_get_subrequest (subreq, netfs_sreq_trace_get_resubmit); - stream->prepare_write (subreq); -__set_bit (NETFS_SREQ_IN_PROGRESS , &subreq->flags); -netfs_stat (&netfs_n_wh_retry_write_subreq); +if (stream->prepare_write) { + stream->prepare_write (subreq); +__set_bit (NETFS_SREQ_IN_PROGRESS , &subreq->flags); +netfs_stat (&netfs_n_wh_retry_write_subreq); + }else { +struct iov_iter source; + +netfs_reset_iter (subreq); + source = subreq->io_iter; +netfs_reissue_write (stream, subreq, &source); + } }netfs_unbuffered_write_done (wreq);
Signature · 1 line
2.43.0
Quoted 10 lines · Deepanshu Kartikey
When a write subrequest is marked
NETFS_SREQ_NEED_RETRY, the retry path innetfs_unbuffered_write()unconditionally callsstream->prepare_write()without checking if it is NULL.Filesystems such as 9P do not set the
prepare_writeoperation, sostream->prepare_writeremains NULL. Whenget_user_pages()fails with-EFAULTand the subrequest is flagged for retry, this results in a NULL pointer dereference atfs/netfs/direct_write.c:189.[...]
Applied to the vfs.fixes branch of the vfs/vfs.git tree. Patches in the vfs.fixes branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.fixes
[1/1] netfs: Fix NULL pointer dereference in netfs_unbuffered_write() on retry
https://git.kernel.org/vfs/vfs/c/e9075e420a1e