Merge tag 'v3.10.105' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 258095676e05ab50677327ab4dcb790d711a4642..685e4c323f2cf37a2b207c748e61c6ce72f4cc60 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2050,6 +2050,8 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
                swab32s(&swap_header->info.version);
                swab32s(&swap_header->info.last_page);
                swab32s(&swap_header->info.nr_badpages);
+               if (swap_header->info.nr_badpages > MAX_SWAP_BADPAGES)
+                       return 0;
                for (i = 0; i < swap_header->info.nr_badpages; i++)
                        swab32s(&swap_header->info.badpages[i]);
        }