1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index fc6a4c8f6e2a..2440814b0069 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -33,7 +33,7 @@ struct cpa_data {
         pgd_t           *pgd;
         pgprot_t        mask_set;
         pgprot_t        mask_clr;
-        int             numpages;
+        unsigned long   numpages;
         int             flags;
         unsigned long   pfn;
         unsigned        force_split : 1;
@@ -1350,7 +1350,7 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)
                  * CPA operation. Either a large page has been
                  * preserved or a single page update happened.
                  */
-                BUG_ON(cpa->numpages > numpages);
+                BUG_ON(cpa->numpages > numpages || !cpa->numpages);
                 numpages -= cpa->numpages;
                 if (cpa->flags & (CPA_PAGES_ARRAY | CPA_ARRAY))
                         cpa->curpage++;