Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbdFJA11 (ORCPT ); Fri, 9 Jun 2017 20:27:27 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36473 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbdFJA10 (ORCPT ); Fri, 9 Jun 2017 20:27:26 -0400 From: frowand.list@gmail.com To: Fu Wei , Mark Rutland , Marc Zyngier , Daniel Lezcano , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] clocksource: fix read and iounmap of incorrect variable Date: Fri, 9 Jun 2017 17:26:32 -0700 Message-Id: <1497054392-13783-1-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1847 Lines: 49 From: Frank Rowand Fix boot warning 'Trying to vfree() nonexistent vm area' from arch_timer_mem_of_init(). Refactored code attempts to read and iounmap using address frame instead of address ioremap(frame->cntbase). Fixes: c389d701dfb70 ("clocksource: arm_arch_timer: split MMIO timer probing.") Signed-off-by: Frank Rowand --- WARNING: CPU: 0 PID: 0 at mm/vmalloc.c:1514 iounmap+0x14/0x18 Trying to vfree() nonexistent vm area (ee821000) Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.12.0-rc1-dirty #1 Hardware name: Generic DT based system [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0x6c/0x8c) [] (dump_stack) from [] (__warn+0xd0/0xf8) [] (__warn) from [] (warn_slowpath_fmt+0x38/0x48) [] (warn_slowpath_fmt) from [] (iounmap+0x14/0x18) [] (iounmap) from [] (arch_timer_mem_of_init+0x224/0x414) [] (arch_timer_mem_of_init) from [] (clocksource_probe+0x44/0xa8) [] (clocksource_probe) from [] (start_kernel+0x228/0x3a0) [] (start_kernel) from [<0020807c>] (0x20807c) drivers/clocksource/arm_arch_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4bed671e490e..8b5c30062d99 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1209,9 +1209,9 @@ static int __init arch_timer_of_init(struct device_node *np) return 0; } - rate = readl_relaxed(frame + CNTFRQ); + rate = readl_relaxed(base + CNTFRQ); - iounmap(frame); + iounmap(base); return rate; } -- Frank Rowand