hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/page_alloc: restrict and formalize compound_page_dtors[] 

Restrict elements in compound_page_dtors[] array per NR_COMPOUND_DTORS and
explicitly position them according to enum compound_dtor_id.  This
improves protection against possible misalignment between
compound_page_dtors[] and enum compound_dtor_id later on.

Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Link: http://lkml.kernel.org/r/1589795958-19317-1-git-send-email-anshuman.khandual@arm.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Anshuman Khandual 2020-06-03 15:59:17 -07:00 committed by Linus Torvalds
parent aa09259109
commit ae70eddd56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mm.h
View File

@ -867,7 +867,7 @@ enum compound_dtor_id {
#endif #endif
NR_COMPOUND_DTORS, NR_COMPOUND_DTORS,
}; };
extern compound_page_dtor * const compound_page_dtors[]; extern compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS];
static inline void set_compound_page_dtor(struct page *page, static inline void set_compound_page_dtor(struct page *page,
enum compound_dtor_id compound_dtor) enum compound_dtor_id compound_dtor)

10
mm/page_alloc.c
View File

@ -302,14 +302,14 @@ const char * const migratetype_names[MIGRATE_TYPES] = {
#endif #endif
}; };
compound_page_dtor * const compound_page_dtors[] = { compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS] = {
NULL, [NULL_COMPOUND_DTOR] = NULL,
free_compound_page, [COMPOUND_PAGE_DTOR] = free_compound_page,
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
free_huge_page, [HUGETLB_PAGE_DTOR] = free_huge_page,
#endif #endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE
free_transhuge_page, [TRANSHUGE_PAGE_DTOR] = free_transhuge_page,
#endif #endif
}; };