From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA887C606BD for ; Mon, 8 Jul 2019 15:32:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A44C5216F4 for ; Mon, 8 Jul 2019 15:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599975; bh=8O11ITLKPbz+4ZI9n9HX2qF0mworvCh5GxMZg3fjy9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K5tmKNBQwCGanovrR5DcRYnJFzXBTWvjIdmbNYYhGUN+RPUG41ugPFwfeON5MaPkd SwDeSnPvCWJCZThrnsHdlq67yrJUi8SFp/cvnnVtJ5+lCGWwETV75zh1W3/DJSfYgj 5N9QX/EZSGjqeSif3zhmlbdo8znmL1176mImHTbc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390227AbfGHPcy (ORCPT ); Mon, 8 Jul 2019 11:32:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:34754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732837AbfGHPcw (ORCPT ); Mon, 8 Jul 2019 11:32:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F4A820665; Mon, 8 Jul 2019 15:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599972; bh=8O11ITLKPbz+4ZI9n9HX2qF0mworvCh5GxMZg3fjy9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FO4ijXv8BE+/kmymKlbikUf68/OeXzglMUSAY/HVLqX/C9CksxtwaLLAZvgXjkADs g0J9JIVtihpVpX5CHRS2GDB9PyaqV9HosNJaFJxo1wgqUF1EKKOONyoL0/DjcdNEbM HyoVj6gGTubbtbxc70f93I6q7JNq8TEaxZWLoaHY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, swkhack , Michal Hocko , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.1 52/96] mm/mlock.c: change count_mm_mlocked_page_nr return type Date: Mon, 8 Jul 2019 17:13:24 +0200 Message-Id: <20190708150529.325236444@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150526.234572443@linuxfoundation.org> References: <20190708150526.234572443@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 0874bb49bb21bf24deda853e8bf61b8325e24bcb ] On a 64-bit machine the value of "vma->vm_end - vma->vm_start" may be negative when using 32 bit ints and the "count >> PAGE_SHIFT"'s result will be wrong. So change the local variable and return value to unsigned long to fix the problem. Link: http://lkml.kernel.org/r/20190513023701.83056-1-swkhack@gmail.com Fixes: 0cf2f6f6dc60 ("mm: mlock: check against vma for actual mlock() size") Signed-off-by: swkhack Acked-by: Michal Hocko Reviewed-by: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/mlock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 080f3b36415b..d614163f569b 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -636,11 +636,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, * is also counted. * Return value: previously mlocked page counts */ -static int count_mm_mlocked_page_nr(struct mm_struct *mm, +static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, unsigned long start, size_t len) { struct vm_area_struct *vma; - int count = 0; + unsigned long count = 0; if (mm == NULL) mm = current->mm; -- 2.20.1