From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Date: Sun, 05 Sep 2010 18:33:08 +0000 Subject: [PATCH 13/14] mm: mempolicy: Check return code of check_range Message-Id: <1283711588-7628-1-git-send-email-segooon@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kernel-janitors@vger.kernel.org Cc: Vasiliy Kulikov , Andrew Morton , KOSAKI Motohiro , Lee Schermerhorn , Christoph Lameter , David Rientjes , linux-kernel@vger.kernel.org, linux-mm@kvack.org From: Vasiliy Kulikov Function check_range may return ERR_PTR(...). Check for it. Signed-off-by: Vasiliy Kulikov --- Compile tested. mm/mempolicy.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f969da5..b73f02c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -924,12 +924,15 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, nodemask_t nmask; LIST_HEAD(pagelist); int err = 0; + struct vm_area_struct *vma; nodes_clear(nmask); node_set(source, nmask); - check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask, + vma = check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask, flags | MPOL_MF_DISCONTIG_OK, &pagelist); + if (IS_ERR(vma)) + return PTR_ERR(vma); if (!list_empty(&pagelist)) err = migrate_pages(&pagelist, new_node_page, dest, 0); -- 1.7.0.4