From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbcITFuw (ORCPT ); Tue, 20 Sep 2016 01:50:52 -0400 Received: from sender153-mail.zoho.com ([74.201.84.153]:25454 "EHLO sender153-mail.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751532AbcITFuv (ORCPT ); Tue, 20 Sep 2016 01:50:51 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=cc:from:subject:to:message-id:date:user-agent:mime-version:content-type; b=CfNj57Ukm83Lk5vJ2KO32jfs8jcebBBdmo7xLOYDLNA84U/7XmkwkXMIf8aWdNekDPwHYH3h9D7/ onADwUZkOzUxQE9UtL4AKby9+VIg9LvyXJZ8eXjVBOiQomkx0YZs Cc: zijun_hu@htc.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org From: zijun_hu Subject: [PATCH 2/3] lib/ioremap.c: avoid endless loop under ioremapping improper ranges To: Andrew Morton Message-ID: <57E0CE04.2070605@zoho.com> Date: Tue, 20 Sep 2016 13:49:56 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: zijun_hu for ioremap_page_range(), endless loop maybe happen if either of parameter addr and end is not page aligned, in order to fix this issue and hint range parameter requirements BUG_ON() checkup are performed firstly for ioremap_pte_range(), loop end condition is optimized due to lack of relevant macro pte_addr_end() Signed-off-by: zijun_hu --- lib/ioremap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ioremap.c b/lib/ioremap.c index 86c8911..0058cc8 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -64,7 +64,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, BUG_ON(!pte_none(*pte)); set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); pfn++; - } while (pte++, addr += PAGE_SIZE, addr != end); + } while (pte++, addr += PAGE_SIZE, addr < end); return 0; } @@ -129,6 +129,7 @@ int ioremap_page_range(unsigned long addr, int err; BUG_ON(addr >= end); + BUG_ON(!PAGE_ALIGNED(addr | end)); start = addr; phys_addr -= addr; -- 1.9.1