Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd_network: Validate ranges but not alignment when coalescing in bus_dma.

Browse Source
This commit is contained in:
Augustin Cavalier 2022-06-14 00:30:14 -04:00
parent e206b2f350
commit c6c03b01c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/compat/freebsd_network/bus_dma.cpp
View File

@ -310,7 +310,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void* vaddr, bus_dmamap_t map)
static bool static bool
_validate_address(bus_dma_tag_t dmat, bus_addr_t paddr) _validate_address(bus_dma_tag_t dmat, bus_addr_t paddr, bool validate_alignment = true)
{ {
do { do {
if (dmat->filter != NULL) { if (dmat->filter != NULL) {
@ -319,7 +319,7 @@ _validate_address(bus_dma_tag_t dmat, bus_addr_t paddr)
} else { } else {
if (paddr > dmat->lowaddr && paddr <= dmat->highaddr) if (paddr > dmat->lowaddr && paddr <= dmat->highaddr)
return false; return false;
if (!vm_addr_align_ok(paddr, dmat->alignment)) if (validate_alignment && !vm_addr_align_ok(paddr, dmat->alignment))
return false; return false;
} }
@ -360,7 +360,9 @@ _bus_load_buffer(bus_dma_tag_t dmat, void* buf, bus_size_t buflen,
&& (dmat->boundary == 0 && (dmat->boundary == 0
|| (segs[seg].ds_addr & boundary_mask) || (segs[seg].ds_addr & boundary_mask)
== (phys_addr & boundary_mask))) { == (phys_addr & boundary_mask))) {
// No need to validate the address here. if (!_validate_address(dmat, phys_addr, false))
return ERANGE;
segs[seg].ds_len += segment_size; segs[seg].ds_len += segment_size;
} else { } else {
if (first) if (first)