mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
commit 0c7d7cc2b4fe2e74ef8728f030f0f1674f9f6aee upstream. There are two problems with the current code of memory_intersects: First, it doesn't check whether the region (begin, end) falls inside the region (virt, vend), that is (virt < begin && vend > end). The second problem is if vend is equal to begin, it will return true but this is wrong since vend (virt + size) is not the last address of the memory region but (virt + size -1) is. The wrong determination will trigger the misreporting when the function check_for_illegal_area calls memory_intersects to check if the dma region intersects with stext region. The misreporting is as below (stext is at 0x80100000): WARNING: CPU: 0 PID: 77 at kernel/dma/debug.c:1073 check_for_illegal_area+0x130/0x168 DMA-API: chipidea-usb2 e0002000.usb: device driver maps memory from kernel text or rodata [addr=800f0000] [len=65536] Modules linked in: CPU: 1 PID: 77 Comm: usb-storage Not tainted 5.19.0-yocto-standard #5 Hardware name: Xilinx Zynq Platform unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x58/0x70 dump_stack_lvl from __warn+0xb0/0x198 __warn from warn_slowpath_fmt+0x80/0xb4 warn_slowpath_fmt from check_for_illegal_area+0x130/0x168 check_for_illegal_area from debug_dma_map_sg+0x94/0x368 debug_dma_map_sg from __dma_map_sg_attrs+0x114/0x128 __dma_map_sg_attrs from dma_map_sg_attrs+0x18/0x24 dma_map_sg_attrs from usb_hcd_map_urb_for_dma+0x250/0x3b4 usb_hcd_map_urb_for_dma from usb_hcd_submit_urb+0x194/0x214 usb_hcd_submit_urb from usb_sg_wait+0xa4/0x118 usb_sg_wait from usb_stor_bulk_transfer_sglist+0xa0/0xec usb_stor_bulk_transfer_sglist from usb_stor_bulk_srb+0x38/0x70 usb_stor_bulk_srb from usb_stor_Bulk_transport+0x150/0x360 usb_stor_Bulk_transport from usb_stor_invoke_transport+0x38/0x440 usb_stor_invoke_transport from usb_stor_control_thread+0x1e0/0x238 usb_stor_control_thread from kthread+0xf8/0x104 kthread from ret_from_fork+0x14/0x2c Refactor memory_intersects to fix the two problems above. Before the 1d7db834a027e ("dma-debug: use memory_intersects() directly"), memory_intersects is called only by printk_late_init: printk_late_init -> init_section_intersects ->memory_intersects. There were few places where memory_intersects was called. When commit 1d7db834a027e ("dma-debug: use memory_intersects() directly") was merged and CONFIG_DMA_API_DEBUG is enabled, the DMA subsystem uses it to check for an illegal area and the calltrace above is triggered. [akpm@linux-foundation.org: fix nearby comment typo] Link: https://lkml.kernel.org/r/20220819081145.948016-1-quanyang.wang@windriver.com Fixes: 979559362516 ("asm/sections: add helpers to check for section data") Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Thierry Reding <treding@nvidia.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
143 lines
4.8 KiB
C
143 lines
4.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_GENERIC_SECTIONS_H_
|
|
#define _ASM_GENERIC_SECTIONS_H_
|
|
|
|
/* References to section boundaries */
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* Usage guidelines:
|
|
* _text, _data: architecture specific, don't use them in arch-independent code
|
|
* [_stext, _etext]: contains .text.* sections, may also contain .rodata.*
|
|
* and/or .init.* sections
|
|
* [_sdata, _edata]: contains .data.* sections, may also contain .rodata.*
|
|
* and/or .init.* sections.
|
|
* [__start_rodata, __end_rodata]: contains .rodata.* sections
|
|
* [__start_ro_after_init, __end_ro_after_init]:
|
|
* contains .data..ro_after_init section
|
|
* [__init_begin, __init_end]: contains .init.* sections, but .init.text.*
|
|
* may be out of this range on some architectures.
|
|
* [_sinittext, _einittext]: contains .init.text.* sections
|
|
* [__bss_start, __bss_stop]: contains BSS sections
|
|
*
|
|
* Following global variables are optional and may be unavailable on some
|
|
* architectures and/or kernel configurations.
|
|
* _text, _data
|
|
* __kprobes_text_start, __kprobes_text_end
|
|
* __entry_text_start, __entry_text_end
|
|
* __ctors_start, __ctors_end
|
|
* __irqentry_text_start, __irqentry_text_end
|
|
* __softirqentry_text_start, __softirqentry_text_end
|
|
*/
|
|
extern char _text[], _stext[], _etext[];
|
|
extern char _data[], _sdata[], _edata[];
|
|
extern char __bss_start[], __bss_stop[];
|
|
extern char __init_begin[], __init_end[];
|
|
extern char _sinittext[], _einittext[];
|
|
extern char __start_ro_after_init[], __end_ro_after_init[];
|
|
extern char _end[];
|
|
extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
|
|
extern char __kprobes_text_start[], __kprobes_text_end[];
|
|
extern char __entry_text_start[], __entry_text_end[];
|
|
extern char __start_rodata[], __end_rodata[];
|
|
extern char __irqentry_text_start[], __irqentry_text_end[];
|
|
extern char __softirqentry_text_start[], __softirqentry_text_end[];
|
|
|
|
/* Start and end of .ctors section - used for constructor calls. */
|
|
extern char __ctors_start[], __ctors_end[];
|
|
|
|
extern __visible const void __nosave_begin, __nosave_end;
|
|
|
|
/* function descriptor handling (if any). Override
|
|
* in asm/sections.h */
|
|
#ifndef dereference_function_descriptor
|
|
#define dereference_function_descriptor(p) (p)
|
|
#endif
|
|
|
|
/* random extra sections (if any). Override
|
|
* in asm/sections.h */
|
|
#ifndef arch_is_kernel_text
|
|
static inline int arch_is_kernel_text(unsigned long addr)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifndef arch_is_kernel_data
|
|
static inline int arch_is_kernel_data(unsigned long addr)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* memory_contains - checks if an object is contained within a memory region
|
|
* @begin: virtual address of the beginning of the memory region
|
|
* @end: virtual address of the end of the memory region
|
|
* @virt: virtual address of the memory object
|
|
* @size: size of the memory object
|
|
*
|
|
* Returns: true if the object specified by @virt and @size is entirely
|
|
* contained within the memory region defined by @begin and @end, false
|
|
* otherwise.
|
|
*/
|
|
static inline bool memory_contains(void *begin, void *end, void *virt,
|
|
size_t size)
|
|
{
|
|
return virt >= begin && virt + size <= end;
|
|
}
|
|
|
|
/**
|
|
* memory_intersects - checks if the region occupied by an object intersects
|
|
* with another memory region
|
|
* @begin: virtual address of the beginning of the memory region
|
|
* @end: virtual address of the end of the memory region
|
|
* @virt: virtual address of the memory object
|
|
* @size: size of the memory object
|
|
*
|
|
* Returns: true if an object's memory region, specified by @virt and @size,
|
|
* intersects with the region specified by @begin and @end, false otherwise.
|
|
*/
|
|
static inline bool memory_intersects(void *begin, void *end, void *virt,
|
|
size_t size)
|
|
{
|
|
void *vend = virt + size;
|
|
|
|
if (virt < end && vend > begin)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* init_section_contains - checks if an object is contained within the init
|
|
* section
|
|
* @virt: virtual address of the memory object
|
|
* @size: size of the memory object
|
|
*
|
|
* Returns: true if the object specified by @virt and @size is entirely
|
|
* contained within the init section, false otherwise.
|
|
*/
|
|
static inline bool init_section_contains(void *virt, size_t size)
|
|
{
|
|
return memory_contains(__init_begin, __init_end, virt, size);
|
|
}
|
|
|
|
/**
|
|
* init_section_intersects - checks if the region occupied by an object
|
|
* intersects with the init section
|
|
* @virt: virtual address of the memory object
|
|
* @size: size of the memory object
|
|
*
|
|
* Returns: true if an object's memory region, specified by @virt and @size,
|
|
* intersects with the init section, false otherwise.
|
|
*/
|
|
static inline bool init_section_intersects(void *virt, size_t size)
|
|
{
|
|
return memory_intersects(__init_begin, __init_end, virt, size);
|
|
}
|
|
|
|
#endif /* _ASM_GENERIC_SECTIONS_H_ */
|