Commit 17e232b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-6.8-2024-01-18' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fixes from Christoph Hellwig:

 - fix kerneldoc warnings (Randy Dunlap)

 - better bounds checking in swiotlb (ZhangPeng)

* tag 'dma-mapping-6.8-2024-01-18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-debug: fix kernel-doc warnings
  swiotlb: check alloc_size before the allocation of a new memory pool
parents 77c9622d 7c65aa3c

kernel/dma/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ enum map_err_types { 
 * @pfn: page frame of the start address

 * @offset: offset of mapping relative to pfn

 * @map_err_type: track whether dma_mapping_error() was checked

 * @stacktrace: support backtraces when a violation is detected

 * @stack_len: number of backtrace entries in @stack_entries

 * @stack_entries: stack of backtrace history

 */

struct dma_debug_entry {

	struct list_head list;

kernel/dma/swiotlb.c

+3 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,9 @@ static int swiotlb_find_slots(struct device *dev, phys_addr_t orig_addr, 
	int cpu, i;

	int index;



	if (alloc_size > IO_TLB_SEGSIZE * IO_TLB_SIZE)

		return -1;



	cpu = raw_smp_processor_id();

	for (i = 0; i < default_nareas; ++i) {

		index = swiotlb_search_area(dev, cpu, i, orig_addr, alloc_size,