Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Fix translation from ABD to physical pages. 

In hypothetical case of non-linear ABD with single segment, multiple
to page size but not aligned to it, vdev_geom_fill_unmap_cb() could
fill one page less into bio_ma array.

I am not sure it is expoitable, but better to be safe than sorry.

Reported-by: Mark Johnston <markj@FreeBSD.org>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
(cherry picked from commit 5352f85cdd)
This commit is contained in:
Alexander Motin 2022-04-18 20:25:49 -04:00 committed by Brian Behlendorf
parent c220771a47
commit 972637dc06
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/os/freebsd/zfs/vdev_geom.c
View File

@ -1132,8 +1132,12 @@ vdev_geom_fill_unmap_cb(void *buf, size_t len, void *priv)
vm_offset_t addr = (vm_offset_t)buf; vm_offset_t addr = (vm_offset_t)buf;
vm_offset_t end = addr + len; vm_offset_t end = addr + len;
if (bp->bio_ma_n == 0) if (bp->bio_ma_n == 0) {
bp->bio_ma_offset = addr & PAGE_MASK; bp->bio_ma_offset = addr & PAGE_MASK;
addr &= ~PAGE_MASK;
} else {
ASSERT0(P2PHASE(addr, PAGE_SIZE));
}
do { do {
bp->bio_ma[bp->bio_ma_n++] = bp->bio_ma[bp->bio_ma_n++] =
PHYS_TO_VM_PAGE(pmap_kextract(addr)); PHYS_TO_VM_PAGE(pmap_kextract(addr));