direct-io: validate user space vectors during extraction
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest6 patches 11 repliesIn review
- v11 patch 5 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | block: introduce bio_endio_errno helperblock/ include/ | +7 | 3 replies | |
| 2/6 | block: report the actual statusblock/ | +1 | 2 replies | |
| 3/6 | block: fix dio leak on metadata mapping errorblock/ | +4 | 1 reply | |
| 4/6 | loop: set dma_alignment from the backing file for direct I/Odrivers/ | +42 | 1 reply | |
| 5/6 | zloop: set dma_alignment from the backing files for direct I/Odrivers/ | +20 | 1 reply | |
| 6/6 | block: validate user space vectors during extractionblock/ block/ block/ +4 more | +61 | 3 replies |
Reviews trailers per patch
1 of 6 patches has a Reviewed-by or Acked-by.
| Patch | Christoph Hellwig |
|---|---|
| 1/6 | |
| 2/6 | |
| 3/6 | R-b |
| 4/6 | |
| 5/6 | |
| 6/6 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCHv2 0/6] direct-io: validate user space vectors during extraction
From: Keith Busch <[email protected]>
This addresses the misaligned direct-io problem behind various threads:
https://lore.kernel.org/linux-xfs/[email protected]/
https://lore.kernel.org/all/CAC_j7i1R7oy+nRhxEjCTba=DUgn02w9X+p94DCu0aHv5+5tKnQ@mail.gmail.com/
https://lore.kernel.org/linux-block/ai7rnH20IYeSmY8s@gallifrey/
https://lore.kernel.org/linux-block/[email protected]/
The previously tested fixes are correct as far as they go, but they treat the symptom: they only matter because an invalid bio reaches those drivers in the first place.
The reason it reaches them is an assumption I made when I removed direct-io alignment checks in 5ff3f74e145a ("block: simplify direct io validity check") and 7eac331869575 ("iomap: simplify direct io validity check"): every bio is eventually split to the device limits, and the upper layers cope with resulting errors once the bio has formed. Both were optimistic assumptions. Drivers with their own ->submit_bio may never pass through blk_mq_submit_bio()'s split, so the check never runs for them, and as numerous threads showed, the consumers don't uniformly handle this condition.
This patch stops the invalid bio at the source instead. It validates the buffer's alignment against the alignment limits when the bio is built from the iov_iter. The check is folded into the bvec extraction that already walks the vectors, so it adds only a comparison on a path that is pinning direct-io pages anyway. Misalignment is now uniformly rejected with EINVAL before submission for every direct-io path.
With this in place, the dm side changes under discussion are no longer required to fix the bugs: the affected targets simply never see the invalid bio. The tested patches remain reasonable as defense-in-depth if desired, but they are not strictly necessary after this.
v1->v2:
I've included some prep patches that fix other issues in this path.
Renamed the alignment to "mem_align_mask", re-ordered the function parameters so it appears before the length alignment, and added the appropriate kerneldoc.
Added additional comments to explain the rationale behind the checks.
For DEBUG kernels, a bio_vec iterator is checked in its entirety. The existing use cases appear to only need the first vector to be checked, so the more expensive exhaustive check is only happening for the debug kernels.
Keith Busch (6):
block: introduce bio_endio_errno helper
block: report the actual status
block: fix dio leak on metadata mapping error
loop: set dma_alignment from the backing file for direct I/O
zloop: set dma_alignment from the backing files for direct I/O
block: validate user space vectors during extraction
block/bio.c | 50 +++++++++++++++++++++++++++++++++++++++--- block/blk-map.c | 2 +- block/blk-merge.c | 4 ++-- block/fops.c | 9 +++++--- drivers/block/loop.c | 50 +++++++++++++++++++++++++++++++++++------- drivers/block/zloop.c | 22 +++++++++++++++++-- fs/iomap/direct-io.c | 1 + include/linux/bio.h | 2 +- include/linux/blkdev.h | 5 +++++ include/linux/uio.h | 3 ++- lib/iov_iter.c | 9 +++++++- 11 files changed, 135 insertions(+), 22 deletions(-)
Signature · 1 line
2.52.0