| Message ID | 1295359829-27308-7-git-send-email-kristoffer@gaisler.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 18, 2011 at 03:10:29PM +0100, Kristoffer Glembo wrote: > Order of kfree and free_pages were swapped in the error handling. Well spotted! Acked-by: Sam Ravnborg <sam@ravnborg.org> Sam -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Sam Ravnborg <sam@ravnborg.org> Date: Tue, 18 Jan 2011 20:43:17 +0100 > On Tue, Jan 18, 2011 at 03:10:29PM +0100, Kristoffer Glembo wrote: >> Order of kfree and free_pages were swapped in the error handling. > Well spotted! > > Acked-by: Sam Ravnborg <sam@ravnborg.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index bd4fb10..c6ce9a6 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -302,9 +302,9 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len, err_noiommu: release_resource(res); err_nova: - free_pages(va, order); -err_nomem: kfree(res); +err_nomem: + free_pages(va, order); err_nopages: return NULL; }
Order of kfree and free_pages were swapped in the error handling. Signed-off-by: Kristoffer Glembo <kristoffer@gaisler.com> --- arch/sparc/kernel/ioport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)