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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 0326AC3A5A3 for ; Fri, 30 Aug 2019 05:38:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C122022CE3 for ; Fri, 30 Aug 2019 05:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567143492; bh=+tsh54x7NRPIr2Q1Fg6dSG7uzr/TfuThBfmWdYNuUZM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=GgMdlPOMeuhGm89fSouKQirwbNyKeAqN26ky4n+TbwuIGbI/BXNo6GBhanbDNaHx+ CUjUyBUkJukisaaWfr2gSIKIRlh0NGsRvyR872s+KJHn14L4FiU27piPV5MNdUmJSh 2pMHNjs6vGe/YU0vz1BIoxsaggXCOqa6TtHD2xbs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728094AbfH3FiL (ORCPT ); Fri, 30 Aug 2019 01:38:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:51718 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725901AbfH3FiL (ORCPT ); Fri, 30 Aug 2019 01:38:11 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DB987ACA0; Fri, 30 Aug 2019 05:38:09 +0000 (UTC) Date: Fri, 30 Aug 2019 07:38:08 +0200 From: Michal Hocko To: Austin Kim Cc: akpm@linux-foundation.org, urezki@gmail.com, guro@fb.com, rpenyaev@suse.de, rick.p.edgecombe@intel.com, rppt@linux.ibm.com, aryabinin@virtuozzo.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/vmalloc: move 'area->pages' after if statement Message-ID: <20190830053808.GM28313@dhcp22.suse.cz> References: <20190830035716.GA190684@LGEARND20B15> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190830035716.GA190684@LGEARND20B15> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 30-08-19 12:57:16, Austin Kim wrote: > If !area->pages statement is true where memory allocation fails, > area is freed. > > In this case 'area->pages = pages' should not executed. > So move 'area->pages = pages' after if statement. > > Signed-off-by: Austin Kim Acked-by: Michal Hocko Thanks! > --- > mm/vmalloc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index b810103..af93ba6 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2416,13 +2416,15 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > } else { > pages = kmalloc_node(array_size, nested_gfp, node); > } > - area->pages = pages; > - if (!area->pages) { > + > + if (!pages) { > remove_vm_area(area->addr); > kfree(area); > return NULL; > } > > + area->pages = pages; > + > for (i = 0; i < area->nr_pages; i++) { > struct page *page; > > -- > 2.6.2 > -- Michal Hocko SUSE Labs