From: Ingo Molnar <mingo@elte.hu>
To: Xiaotian Feng <dfeng@redhat.com>
Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, venkatesh.pallipadi@intel.com,
suresh.b.siddha@intel.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86: add missing free_memtype if get_vm_area_caller failed
Date: Wed, 4 Nov 2009 11:51:49 +0100 [thread overview]
Message-ID: <20091104105149.GC13194@elte.hu> (raw)
In-Reply-To: <1257317289-21951-1-git-send-email-dfeng@redhat.com>
* Xiaotian Feng <dfeng@redhat.com> wrote:
> When __ioremap_caller goes into get_vm_area, kernel already reserved
> memtype. so if get_vm_area fails, we need to free it before return.
>
> Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: H. Peter Anvin <hpa@zytor.com>
> Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
> Cc: Suresh Siddha <suresh.b.siddha@intel.com>
> ---
> arch/x86/mm/ioremap.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
> index 334e63c..7859f77 100644
> --- a/arch/x86/mm/ioremap.c
> +++ b/arch/x86/mm/ioremap.c
> @@ -196,8 +196,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
> * Ok, go for it..
> */
> area = get_vm_area_caller(size, VM_IOREMAP, caller);
> - if (!area)
> + if (!area) {
> + free_memtype(phys_addr, phys_addr + size);
> return NULL;
> + }
> area->phys_addr = phys_addr;
> vaddr = (unsigned long) area->addr;
Nice one!
Mind structuring this fix in a bit different way please?
The main cause of this bug is the following unclean resource-teardown
pattern in __ioremap_caller():
area = get_vm_area_caller(size, VM_IOREMAP, caller);
if (!area)
return NULL;
area->phys_addr = phys_addr;
vaddr = (unsigned long) area->addr;
if (kernel_map_sync_memtype(phys_addr, size, prot_val)) {
free_memtype(phys_addr, phys_addr + size);
free_vm_area(area);
return NULL;
}
if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
free_memtype(phys_addr, phys_addr + size);
free_vm_area(area);
return NULL;
}
see how repetitive it is, and how the return sequence is duplicated?
The way we do this is to add an error path to the tail of the function:
err_free_area:
free_vm_area(area);
err_free_memtype:
free_memtype(phys_addr, phys_addr + size);
return NULL;
and changing the failure branches to:
if (!area)
goto err_free_memtype;
...
if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot))
goto err_free_area;
etc.
Ok?
Ingo
next prev parent reply other threads:[~2009-11-04 10:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-04 6:48 [PATCH] x86: add missing free_memtype if get_vm_area_caller failed Xiaotian Feng
2009-11-04 10:51 ` Ingo Molnar [this message]
2009-11-05 2:43 ` [PATCH V2] x86: fix error return sequence in __ioremap_caller Xiaotian Feng
2009-11-06 0:23 ` Suresh Siddha
2009-11-08 11:15 ` Ingo Molnar
2009-11-08 11:18 ` [tip:x86/urgent] x86: Fix error return sequence in __ioremap_caller() tip-bot for Xiaotian Feng
2009-11-08 11:51 ` tip-bot for Xiaotian Feng
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=20091104105149.GC13194@elte.hu \
--to=mingo@elte.hu \
--cc=dfeng@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=venkatesh.pallipadi@intel.com \
--cc=x86@kernel.org \
/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.