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.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 12880C43603 for ; Sat, 14 Dec 2019 00:44:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E34EC20724 for ; Sat, 14 Dec 2019 00:44:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="NthJMitm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E34EC20724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 668FC8E0005; Fri, 13 Dec 2019 19:44:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6197C8E0001; Fri, 13 Dec 2019 19:44:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5086E8E0005; Fri, 13 Dec 2019 19:44:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 35A758E0001 for ; Fri, 13 Dec 2019 19:44:42 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id F1248824999B for ; Sat, 14 Dec 2019 00:44:41 +0000 (UTC) X-FDA: 76261901604.12.cork43_28b0073fade3f X-HE-Tag: cork43_28b0073fade3f X-Filterd-Recvd-Size: 4200 Received: from hqnvemgate26.nvidia.com (hqnvemgate26.nvidia.com [216.228.121.65]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Sat, 14 Dec 2019 00:44:39 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 13 Dec 2019 16:44:30 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 13 Dec 2019 16:44:37 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 13 Dec 2019 16:44:37 -0800 Received: from [10.110.48.28] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sat, 14 Dec 2019 00:44:37 +0000 Subject: Re: [PATCH v2] mm/gup: Fix memory leak in __gup_benchmark_ioctl To: Navid Emamdoost , Andrew Morton , "Kirill A. Shutemov" , Keith Busch , , CC: References: <9a692d27-4654-f1fc-d4c5-c6efba02c8a9@nvidia.com> <20191213223751.4089-1-navid.emamdoost@gmail.com> X-Nvconfidentiality: public From: John Hubbard Message-ID: <2690f981-7291-f3fd-2f28-5d16f697f320@nvidia.com> Date: Fri, 13 Dec 2019 16:44:35 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: <20191213223751.4089-1-navid.emamdoost@gmail.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1576284270; bh=MLaoq1HvWNuPndisp3PFCN1X+uEl1V/8kfciklEUVvo=; h=X-PGP-Universal:Subject:To:CC:References:X-Nvconfidentiality:From: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=NthJMitmyfjMWWnOwkaPgexAM26yp3PDLlBswnZOF/FRCLfiC5v4JV/rJYt9D0b6N trjEm2jVRc3c/anL8vW8YWLncJJP0TfVcJRASDReBnMGfdd4kUrgHcG2mtMt3WqSXn fvUKaz4CGy0yazLdEfcw3MpbOlvsajTar/oBNjVwrVUMXgH8m0eHxQv9Lf7mzfo5EC u8t18fJPT0luUO3iEM1LRaa7Y1XJHDYkLwQXEF+3yv+rgWqTTz/Y8nPPDJ4AzJ4Vqw Tkh5prl5KGrZkgVdYroJwicr5SXt3jNHUswUVjaSlXkrv43IzsO2dYmHL2F0H2wmL+ e0Mu5QOnfi/9A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 12/13/19 2:37 PM, Navid Emamdoost wrote: > In the implementation of __gup_benchmark_ioctl() the allocated pages > should be released before returning in case of an invalid cmd. Release > pages via kvfree() by goto done. > > Fixes: 714a3a1ebafe ("mm/gup_benchmark.c: add additional pinning methods") > Signed-off-by: Navid Emamdoost > --- > Changes in v2: > -- added goto and ret value instead of return -1. > --- > mm/gup_benchmark.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > Reviewed-by: John Hubbard thanks, -- John Hubbard NVIDIA > diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c > index b160638f647e..b773b2568544 100644 > --- a/mm/gup_benchmark.c > +++ b/mm/gup_benchmark.c > @@ -24,7 +24,7 @@ static int __gup_benchmark_ioctl(unsigned int cmd, > { > ktime_t start_time, end_time; > unsigned long i, nr_pages, addr, next; > - int nr; > + int nr, ret = 0; > struct page **pages; > > if (gup->size > ULONG_MAX) > @@ -63,8 +63,8 @@ static int __gup_benchmark_ioctl(unsigned int cmd, > NULL); > break; > default: > - kvfree(pages); > - return -1; > + ret = -EINVAL; > + goto done; > } > > if (nr <= 0) > @@ -85,8 +85,9 @@ static int __gup_benchmark_ioctl(unsigned int cmd, > end_time = ktime_get(); > gup->put_delta_usec = ktime_us_delta(end_time, start_time); > > +done: > kvfree(pages); > - return 0; > + return ret; > } > > static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd, >