From 18aa65252bc864b5aee1567200b26100cc751e64 Mon Sep 17 00:00:00 2001 From: Jann Horn Date: Sat, 10 Oct 2020 15:40:23 +0800 Subject: [PATCH] mm/vmstat.c: assert that vmstat_text is in sync with stat_items_size mainline inclusion from mainline-4.20-rc1 commit f0ecf25a093fc0589f0a6bc4c1ea068bbb67d220 category: bugfix bugzilla: 34611 CVE: NA ------------------------------------------------- Having two gigantic arrays that must manually be kept in sync, including ifdefs, isn't exactly robust. To make it easier to catch such issues in the future, add a BUILD_BUG_ON(). Link: http://lkml.kernel.org/r/20181001143138.95119-3-jannh@google.com Signed-off-by: Jann Horn Reviewed-by: Kees Cook Reviewed-by: Andrew Morton Acked-by: Roman Gushchin Acked-by: Michal Hocko Cc: Davidlohr Bueso Cc: Oleg Nesterov Cc: Christoph Lameter Cc: Kemi Wang Cc: Andy Lutomirski Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit f0ecf25a093fc0589f0a6bc4c1ea068bbb67d220) Signed-off-by: Kefeng Wang Signed-off-by: Liu Shixin Reviewed-by: Kefeng Wang Signed-off-by: Yang Yingliang --- mm/vmstat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/vmstat.c b/mm/vmstat.c index d1c02a4fe9f8..439a73d53c9e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1680,6 +1680,8 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos) stat_items_size += sizeof(struct vm_event_state); #endif + BUILD_BUG_ON(stat_items_size != + ARRAY_SIZE(vmstat_text) * sizeof(unsigned long)); v = kmalloc(stat_items_size, GFP_KERNEL); m->private = v; if (!v) -- GitLab