From: Denis Kirjanov <kda@linux-powerpc.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, airlied@gmail.com
Subject: Re: [PATCH] agp/uninorth: fix a memleak in create_gatt_table
Date: Mon, 7 Sep 2015 10:30:48 +0300 [thread overview]
Message-ID: <CAOJe8K13odLN__uQCc=zXoFYMyjwzEd10eDKG_ZEq5oZf1376A@mail.gmail.com> (raw)
In-Reply-To: <1434676130.3678.124.camel@kernel.crashing.org>
On 6/19/15, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> On Thu, 2015-06-18 at 17:34 +0300, Denis Kirjanov wrote:
>> On 6/12/15, Denis Kirjanov <kda@linux-powerpc.org> wrote:
>> > Fix the memory leak in create_gatt_table:
>> > we've lost a kfree on the exit path for the pages array allocated
>> > in uninorth_create_gatt_table
>> >
>> > Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
>>
>> Hi Ben, Michael
>>
>> Will you take the patch through your trees or do I need to send it to
>> Dave Airlie?
>
> I haven't had a chance to review yet...
Ping...
>
> Ben.
>
>> Thanks
>> > ---
>> > drivers/char/agp/uninorth-agp.c | 16 ++++++++++------
>> > 1 file changed, 10 insertions(+), 6 deletions(-)
>> >
>> > diff --git a/drivers/char/agp/uninorth-agp.c
>> > b/drivers/char/agp/uninorth-agp.c
>> > index a56ee9b..0575544 100644
>> > --- a/drivers/char/agp/uninorth-agp.c
>> > +++ b/drivers/char/agp/uninorth-agp.c
>> > @@ -361,6 +361,10 @@ static int agp_uninorth_resume(struct pci_dev
>> > *pdev)
>> > }
>> > #endif /* CONFIG_PM */
>> >
>> > +static struct {
>> > + struct page **pages_arr;
>> > +} uninorth_priv;
>> > +
>> > static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
>> > {
>> > char *table;
>> > @@ -371,7 +375,6 @@ static int uninorth_create_gatt_table(struct
>> > agp_bridge_data *bridge)
>> > int i;
>> > void *temp;
>> > struct page *page;
>> > - struct page **pages;
>> >
>> > /* We can't handle 2 level gatt's */
>> > if (bridge->driver->size_type == LVL2_APER_SIZE)
>> > @@ -400,8 +403,8 @@ static int uninorth_create_gatt_table(struct
>> > agp_bridge_data *bridge)
>> > if (table == NULL)
>> > return -ENOMEM;
>> >
>> > - pages = kmalloc((1 << page_order) * sizeof(struct page*),
>> > GFP_KERNEL);
>> > - if (pages == NULL)
>> > + uninorth_priv.pages_arr = kmalloc((1 << page_order) * sizeof(struct
>> > page*), GFP_KERNEL);
>> > + if (uninorth_priv.pages_arr == NULL)
>> > goto enomem;
>> >
>> > table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1);
>> > @@ -409,14 +412,14 @@ static int uninorth_create_gatt_table(struct
>> > agp_bridge_data *bridge)
>> > for (page = virt_to_page(table), i = 0; page <=
>> > virt_to_page(table_end);
>> > page++, i++) {
>> > SetPageReserved(page);
>> > - pages[i] = page;
>> > + uninorth_priv.pages_arr[i] = page;
>> > }
>> >
>> > bridge->gatt_table_real = (u32 *) table;
>> > /* Need to clear out any dirty data still sitting in caches */
>> > flush_dcache_range((unsigned long)table,
>> > (unsigned long)table_end + 1);
>> > - bridge->gatt_table = vmap(pages, (1 << page_order), 0,
>> > PAGE_KERNEL_NCG);
>> > + bridge->gatt_table = vmap(uninorth_priv.pages_arr, (1 << page_order),
>> > 0,
>> > PAGE_KERNEL_NCG);
>> >
>> > if (bridge->gatt_table == NULL)
>> > goto enomem;
>> > @@ -434,7 +437,7 @@ static int uninorth_create_gatt_table(struct
>> > agp_bridge_data *bridge)
>> > return 0;
>> >
>> > enomem:
>> > - kfree(pages);
>> > + kfree(uninorth_priv.pages_arr);
>> > if (table)
>> > free_pages((unsigned long)table, page_order);
>> > return -ENOMEM;
>> > @@ -456,6 +459,7 @@ static int uninorth_free_gatt_table(struct
>> > agp_bridge_data *bridge)
>> > */
>> >
>> > vunmap(bridge->gatt_table);
>> > + kfree(uninorth_priv.pages_arr);
>> > table = (char *) bridge->gatt_table_real;
>> > table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1);
>> >
>> > --
>> > 2.4.0
>> >
>> >
>
>
>
next prev parent reply other threads:[~2015-09-07 7:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-12 6:57 [PATCH] agp/uninorth: fix a memleak in create_gatt_table Denis Kirjanov
2015-06-18 14:34 ` Denis Kirjanov
2015-06-19 1:08 ` Benjamin Herrenschmidt
2015-09-07 7:30 ` Denis Kirjanov [this message]
2015-09-07 10:28 ` Michael Ellerman
2015-09-07 10:39 ` Denis Kirjanov
2015-09-08 3:51 ` Michael Ellerman
2015-10-02 8:48 ` Denis Kirjanov
2015-10-12 11:17 ` Michael Ellerman
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='CAOJe8K13odLN__uQCc=zXoFYMyjwzEd10eDKG_ZEq5oZf1376A@mail.gmail.com' \
--to=kda@linux-powerpc.org \
--cc=airlied@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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.