Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+5 -1
+2 -1
kernel/dma/debug.c
··· 62 62 * @pfn: page frame of the start address 63 63 * @offset: offset of mapping relative to pfn 64 64 * @map_err_type: track whether dma_mapping_error() was checked 65 - * @stacktrace: support backtraces when a violation is detected 65 + * @stack_len: number of backtrace entries in @stack_entries 66 + * @stack_entries: stack of backtrace history 66 67 */ 67 68 struct dma_debug_entry { 68 69 struct list_head list;
+3
kernel/dma/swiotlb.c
··· 1136 1136 int cpu, i; 1137 1137 int index; 1138 1138 1139 + if (alloc_size > IO_TLB_SEGSIZE * IO_TLB_SIZE) 1140 + return -1; 1141 + 1139 1142 cpu = raw_smp_processor_id(); 1140 1143 for (i = 0; i < default_nareas; ++i) { 1141 1144 index = swiotlb_search_area(dev, cpu, i, orig_addr, alloc_size,