d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

busdma: _bus_dmamap_addseg repaired

Browse Source 
A recent change introduced a one-off error into a test allowing
coalescing chunks into segments.  This fixes that error.

broke a check in _bus_dmamap_addseg on many architectures. This change makes it clear that it is not a particular range that is being boundary-checked, but the proposed union of the two adjacent ranges.
Reported by:	se
Reviewed by:	se
Fixes:	c606ab59e7 vm_extern: use standard address checkers everywhere
Differential Revision:	https://reviews.freebsd.org/D33715
This commit is contained in:
Doug Moore 2022-01-02 12:37:05 -06:00
parent 1b90dfa5d2
commit f1e7a532d1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/arm/busdma_machdep.c
View File

@ -1027,8 +1027,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
} else {
if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
(segs[seg].ds_len + sgsize) <= dmat->maxsegsz &&
vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len,
dmat->boundary))
vm_addr_bound_ok(segs[seg].ds_addr,
segs[seg].ds_len + sgsize, dmat->boundary))
segs[seg].ds_len += sgsize;
else {
if (++seg >= dmat->nsegments)

4
sys/arm64/arm64/busdma_bounce.c
View File

@ -787,8 +787,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
} else {
if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
(segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz &&
vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len,
dmat->common.boundary))
vm_addr_bound_ok(segs[seg].ds_addr,
segs[seg].ds_len + sgsize, dmat->common.boundary))
segs[seg].ds_len += sgsize;
else {
if (++seg >= dmat->common.nsegments)

4
sys/powerpc/powerpc/busdma_machdep.c
View File

@ -708,8 +708,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
} else {
if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
(segs[seg].ds_len + sgsize) <= dmat->maxsegsz &&
vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len,
dmat->boundary))
vm_addr_bound_ok(segs[seg].ds_addr,
segs[seg].ds_len + sgsize, dmat->boundary))
segs[seg].ds_len += sgsize;
else {
if (++seg >= dmat->nsegments)

4
sys/riscv/riscv/busdma_bounce.c
View File

@ -656,8 +656,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
} else {
if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
(segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz &&
vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len,
dmat->common.boundary))
vm_addr_bound_ok(segs[seg].ds_addr,
segs[seg].ds_len + sgsize, dmat->common.boundary))
segs[seg].ds_len += sgsize;
else {
if (++seg >= dmat->common.nsegments)

4
sys/x86/x86/busdma_bounce.c
View File

@ -718,8 +718,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t curaddr,
} else {
if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
(segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz &&
vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len,
dmat->common.boundary))
vm_addr_bound_ok(segs[seg].ds_addr,
segs[seg].ds_len + sgsize, dmat->common.boundary))
segs[seg].ds_len += sgsize;
else {
if (++seg >= dmat->common.nsegments)