netfs: Fix kernel BUG in netfs_limit_iter() for ITER_KVEC iterators
Subsystems (2)
PATCH 1/1 netfs: Fix kernel BUG in netfs_limit_iter() for ITER_KVEC iterators
When a process crashes and the kernel writes a core dump to a 9P filesystem, __kernel_write() creates an ITER_KVEC iterator. This iterator reaches netfs_limit_iter() via netfs_unbuffered_write(), which only handles ITER_FOLIOQ, ITER_BVEC and ITER_XARRAY iterator types, hitting the BUG() for any other type.
Fix this by adding netfs_limit_kvec() following the same pattern as netfs_limit_bvec(), since both kvec and bvec are simple segment arrays with pointer and length fields. Dispatch it from netfs_limit_iter() when the iterator type is ITER_KVEC.
--- fs/netfs/iterator.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
fs/netfs/iterator.c +43 -0
@@ -142,6 +142,47 @@ static size_t netfs_limit_bvec(const struct iov_iter *iter, size_t start_offset,return min (span, max_size); } +/* +* Select the span of a kvec iterator we're going to use. Limit it by both +* maximum size and maximum number of segments. Returns the size of the span +* in bytes. +*/ +static size_t netfs_limit_kvec (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs) +{ +const struct kvec *kvecs = iter->kvec; +unsigned int nkv = iter->nr_segs, ix =0 , nsegs =0 ; +size_t len, span =0 , n = iter->count; +size_t skip = iter->iov_offset + start_offset; + +if (WARN_ON (!iov_iter_is_kvec (iter)) || +WARN_ON (start_offset > n) || + n ==0 ) +return 0 ; + +while (n && ix < nkv && skip) { + len = kvecs[ix].iov_len; +if (skip < len) +break ; + skip -= len; + n -= len; + ix++; + } + +while (n && ix < nkv) { + len =min3 (n, kvecs[ix].iov_len - skip, max_size); + span += len; + nsegs++; + ix++; +if (span >= max_size || nsegs >= max_segs) +break ; + skip =0 ; + n -= len; + } + +return min (span, max_size); +} +/* * Select the span of an xarray iterator we're going to use. Limit it by both * maximum size and maximum number of segments. It is assumed that segments
@@ -245,6 +286,8 @@ size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset,return netfs_limit_bvec (iter, start_offset, max_size, max_segs);if (iov_iter_is_xarray (iter))return netfs_limit_xarray (iter, start_offset, max_size, max_segs); +if (iov_iter_is_kvec (iter)) +return netfs_limit_kvec (iter, start_offset, max_size, max_segs);BUG (); }EXPORT_SYMBOL (netfs_limit_iter);
Signature · 1 line
2.43.0
David Howells
maintainerThanks very much for these two patches :-)
David
Quoted 6 lines · Deepanshu Kartikey
When a process crashes and the kernel writes a core dump to a 9P filesystem,
__kernel_write()creates anITER_KVECiterator. This iterator reachesnetfs_limit_iter()vianetfs_unbuffered_write(), which only handlesITER_FOLIOQ,ITER_BVECandITER_XARRAYiterator types, hitting theBUG()for any other type.
Quoted 6 lines
Fix this by adding
netfs_limit_kvec()following the same pattern asnetfs_limit_bvec(), since both kvec and bvec are simple segment arrays with pointer and length fields. Dispatch it fromnetfs_limit_iter()when the iterator type isITER_KVEC.[...]
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 kernel BUG in netfs_limit_iter() for ITER_KVEC iterators
https://git.kernel.org/vfs/vfs/c/67e467a11f62
Deepanshu, David,
Quoted 10 lines · Deepanshu Kartikey
When a process crashes and the kernel writes a core dump to a 9P filesystem,
__kernel_write()creates anITER_KVECiterator. This iterator reachesnetfs_limit_iter()vianetfs_unbuffered_write(), which only handlesITER_FOLIOQ,ITER_BVECandITER_XARRAYiterator types, hitting theBUG()for any other type.Fix this by adding
netfs_limit_kvec()following the same pattern asnetfs_limit_bvec(), since both kvec and bvec are simple segment arrays with pointer and length fields. Dispatch it fromnetfs_limit_iter()when the iterator type isITER_KVEC.
[ 1.901035] kernel BUG at fs/netfs/iterator.c:248!
We hit the issue in v6.18.17 and the patch resolved it.
Thanks,
Quoted 74 lines
Fixes cae932d3aee5 ("netfs: Add func to calculate pagecount/size-limited span of an iterator")Reported-by [email protected]Tested-by [email protected]Signed-off-by Deepanshu Kartikey <[email protected]>--- fs/netfs/iterator.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)fs/netfs/iterator.c +43
-0@@ -142,6 +142,47 @@ static size_t netfs_limit_bvec(const struct iov_iter *iter, size_t start_offset,return min (span, max_size); } +/* +* Select the span of a kvec iterator we're going to use. Limit it by both +* maximum size and maximum number of segments. Returns the size of the span +* in bytes. +*/ +static size_t netfs_limit_kvec (const struct iov_iter *iter,size_t start_offset, +size_t max_size,size_t max_segs) +{ +const struct kvec *kvecs = iter->kvec; +unsigned int nkv = iter->nr_segs, ix =0 , nsegs =0 ; +size_t len, span =0 , n = iter->count; +size_t skip = iter->iov_offset + start_offset; + +if (WARN_ON (!iov_iter_is_kvec (iter)) || +WARN_ON (start_offset > n) || + n ==0 ) +return 0 ; + +while (n && ix < nkv && skip) { + len = kvecs[ix].iov_len; +if (skip < len) +break ; + skip -= len; + n -= len; + ix++; + } + +while (n && ix < nkv) { + len =min3 (n, kvecs[ix].iov_len - skip, max_size); + span += len; + nsegs++; + ix++; +if (span >= max_size || nsegs >= max_segs) +break ; + skip =0 ; + n -= len; + } + +return min (span, max_size); +} +/* * Select the span of an xarray iterator we're going to use. Limit it by both * maximum size and maximum number of segments. It is assumed that segments @@ -245,6 +286,8 @@ size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset,return netfs_limit_bvec (iter, start_offset, max_size, max_segs);if (iov_iter_is_xarray (iter))return netfs_limit_xarray (iter, start_offset, max_size, max_segs); +if (iov_iter_is_kvec (iter)) +return netfs_limit_kvec (iter, start_offset, max_size, max_segs);BUG (); }EXPORT_SYMBOL (netfs_limit_iter);Signature · 1 line
2.43.0