From: Ira Weiny <ira.weiny@intel.com>
To: Navid Emamdoost <navid.emamdoost@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Keith Busch <keith.busch@intel.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
emamd001@umn.edu, jhubbard@nvidia.com
Subject: Re: [PATCH v2] mm/gup: Fix memory leak in __gup_benchmark_ioctl
Date: Fri, 13 Dec 2019 15:12:34 -0800 [thread overview]
Message-ID: <20191213231234.GB8347@iweiny-DESK2.sc.intel.com> (raw)
In-Reply-To: <20191213223751.4089-1-navid.emamdoost@gmail.com>
On Fri, Dec 13, 2019 at 04:37:41PM -0600, 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 <navid.emamdoost@gmail.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
> ---
> Changes in v2:
> -- added goto and ret value instead of return -1.
> ---
> mm/gup_benchmark.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> 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,
> --
> 2.17.1
>
>
next prev parent reply other threads:[~2019-12-13 23:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 17:46 [PATCH] mm/gup: Fix memory leak in __gup_benchmark_ioctl Navid Emamdoost
2019-12-12 23:14 ` Ira Weiny
2019-12-13 21:40 ` John Hubbard
2019-12-13 22:23 ` Andrew Morton
2019-12-13 22:39 ` Navid Emamdoost
2019-12-13 22:39 ` Navid Emamdoost
2019-12-13 22:37 ` [PATCH v2] " Navid Emamdoost
2019-12-13 23:12 ` Ira Weiny [this message]
2019-12-14 0:44 ` John Hubbard
2019-12-14 18:10 ` Markus Elfring
2019-12-14 18:10 ` Markus Elfring
2019-12-16 12:18 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213231234.GB8347@iweiny-DESK2.sc.intel.com \
--to=ira.weiny@intel.com \
--cc=akpm@linux-foundation.org \
--cc=emamd001@umn.edu \
--cc=jhubbard@nvidia.com \
--cc=keith.busch@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=navid.emamdoost@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.