alloc_tag: fix module allocation tags populated area calculation
Suren Baghdasaryan
maintainerPATCH 1/2 alloc_tag: fix module allocation tags populated area calculation
vm_module_tags_populate() calculation of the populated area assumes that area starts at a page boundary and therefore when new pages are allocation, the end of the area is page-aligned as well. If the start of the area is not page-aligned then allocating a page and incrementing the end of the area by PAGE_SIZE leads to an area at the end but within the area boundary which is not populated. Accessing this are will lead to a kernel panic. Fix the calculation by down-aligning the start of the area and using that as the location allocated pages are mapped to.
---
Applies over mm-unstable
lib/alloc_tag.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
lib/alloc_tag.c +6 -5
@@ -393,19 +393,20 @@ static bool find_aligned_area(struct ma_state *mas, unsigned long section_size,static int vm_module_tags_populate (void ) { -unsigned long phys_size = vm_module_tags->nr_pages <<PAGE_SHIFT ; +unsigned long phys_end =ALIGN_DOWN (module_tags.start_addr,PAGE_SIZE ) + + (vm_module_tags->nr_pages <<PAGE_SHIFT ); +unsigned long new_end = module_tags.start_addr + module_tags.size; -if (phys_size < module_tags.size) { +if (phys_end < new_end) {struct page **next_page = vm_module_tags->pages + vm_module_tags->nr_pages; -unsigned long addr = module_tags.start_addr + phys_size;unsigned long more_pages;unsigned long nr; - more_pages =ALIGN (module_tags.size - phys_size,PAGE_SIZE ) >>PAGE_SHIFT ; + more_pages =ALIGN (new_end - phys_end,PAGE_SIZE ) >>PAGE_SHIFT ; nr =alloc_pages_bulk_array_node (GFP_KERNEL | __GFP_NOWARN,NUMA_NO_NODE , more_pages, next_page);if (nr < more_pages || -vmap_pages_range (addr, addr + (nr <<PAGE_SHIFT ),PAGE_KERNEL , +vmap_pages_range (phys_end, phys_end + (nr <<PAGE_SHIFT ),PAGE_KERNEL , next_page,PAGE_SHIFT ) <0 ) {/* Clean up and error out */ for (int i =0 ; i < nr; i++)
base-commit: 539cd49425a4e9a66d601d9a8124f5c70e238d56
Signature · 1 line
2.47.0.338.g60cca15819-goog
Suren Baghdasaryan
maintainerPATCH 2/2 alloc_tag: fix set_codetag_empty() when !CONFIG_MEM_ALLOC_PROFILING_DEBUG
It was recently noticed that set_codetag_empty() might be used not only to mark NULL alloctag references as empty to avoid warnings but also to reset valid tags (in clear_page_tag_ref()). Since set_codetag_empty() is defined as NOOP for CONFIG_MEM_ALLOC_PROFILING_DEBUG=n, such use of set_codetag_empty() leads to subtle bugs.
Fix set_codetag_empty() for CONFIG_MEM_ALLOC_PROFILING_DEBUG=n to reset the tag reference.
---
Applies over mm-unstable
include/linux/alloc_tag.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/alloc_tag.h +6 -1
@@ -63,7 +63,12 @@ static inline void set_codetag_empty(union codetag_ref *ref)#else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ static inline bool is_codetag_empty (union codetag_ref *ref) {return false; } -static inline void set_codetag_empty (union codetag_ref *ref) {} + +static inline void set_codetag_empty (union codetag_ref *ref) +{ +if (ref) + ref->ct =NULL ; +}#endif /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */
Signature · 1 line
2.47.0.338.g60cca15819-goog
Quoted 10 lines · Suren Baghdasaryan
vm_module_tags_populate()calculation of the populated area assumes that area starts at a page boundary and therefore when new pages are allocation, the end of the area is page-aligned as well. If the start of the area is not page-aligned then allocating a page and incrementing the end of the area byPAGE_SIZEleads to an area at the end but within the area boundary which is not populated. Accessing this are will lead to a kernel panic. Fix the calculation by down-aligning the start of the area and using that as the location allocated pages are mapped to.
Quoted 4 lines
Fixes 0f9b685626da ("alloc_tag: populate memory for module tags as needed")Reported-by kernel test robot <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>