X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=mm%2Fswapfile.c;h=ecf2702595b234a36d6f63a7d6d87726d234dc7e;hp=3579afb1bc543ff2a5b378be493dfe172de72d66;hb=4cecd7e369e1b252db1d64451462221b362eed1c;hpb=147ee65b012b3ab82e004f18d8f8a9980400358f

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3579afb1bc54..ecf2702595b2 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1913,6 +1913,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]);
 	}