From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8730BC49ED7 for ; Fri, 13 Sep 2019 13:19:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FC7E214AE for ; Fri, 13 Sep 2019 13:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380798; bh=Tp8MXWBSE552OhJPfHXEWhrl96I1Fed4vFY+aEga0Oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x9+SzI8spRNnRKYInJf7Jh26AoUoHYJwdGZ7G98IcanoTdacYnSNRaUHczMqkYhy9 1159mRZUAg/NOe/7FxtLEmL6CwhQclImB84Y2PiOK+phNwEuhF/XlZEAZC3I8mldjK 2kz9jFgVh+RPaP9m1WW9e8yAvgsmep3GpUy7NEN4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390471AbfIMNT4 (ORCPT ); Fri, 13 Sep 2019 09:19:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390461AbfIMNTz (ORCPT ); Fri, 13 Sep 2019 09:19:55 -0400 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E71B20CC7; Fri, 13 Sep 2019 13:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568380794; bh=Tp8MXWBSE552OhJPfHXEWhrl96I1Fed4vFY+aEga0Oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GyLozP8SrFJADOOV8tzEMU3PvF0zgxd4HsNbbZqgenRw6hESOaMnavdETusYL6JSN T3SpseUwEwA0CEh1LNIeiUqJ2QSTNSmU2od4gyQB9ZMLB/1qWS4RrhVv06T3k+CtwJ 1ZBWCpKVz2cPtj5CoER+tz1Nrztfcaq1j4ctzfUE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Helgaas , Borislav Petkov , Andrew Morton , Brijesh Singh , Dan Williams , "H. Peter Anvin" , Lianbo Jiang , Takashi Iwai , Thomas Gleixner , Tom Lendacky , Vivek Goyal , Yaowei Bai , bhe@redhat.com, dyoung@redhat.com, kexec@lists.infradead.org, mingo@redhat.com, x86-ml , Sasha Levin Subject: [PATCH 4.19 162/190] resource: Include resource end in walk_*() interfaces Date: Fri, 13 Sep 2019 14:06:57 +0100 Message-Id: <20190913130612.849195474@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913130559.669563815@linuxfoundation.org> References: <20190913130559.669563815@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit a98959fdbda1849a01b2150bb635ed559ec06700 ] find_next_iomem_res() finds an iomem resource that covers part of a range described by "start, end". All callers expect that range to be inclusive, i.e., both start and end are included, but find_next_iomem_res() doesn't handle the end address correctly. If it finds an iomem resource that contains exactly the end address, it skips it, e.g., if "start, end" is [0x0-0x10000] and there happens to be an iomem resource [mem 0x10000-0x10000] (the single byte at 0x10000), we skip it: find_next_iomem_res(...) { start = 0x0; end = 0x10000; for (p = next_resource(...)) { # p->start = 0x10000; # p->end = 0x10000; # we *should* return this resource, but this condition is false: if ((p->end >= start) && (p->start < end)) break; Adjust find_next_iomem_res() so it allows a resource that includes the single byte at the end of the range. This is a corner case that we probably don't see in practice. Fixes: 58c1b5b07907 ("[PATCH] memory hotadd fixes: find_next_system_ram catch range fix") Signed-off-by: Bjorn Helgaas Signed-off-by: Borislav Petkov CC: Andrew Morton CC: Brijesh Singh CC: Dan Williams CC: H. Peter Anvin CC: Lianbo Jiang CC: Takashi Iwai CC: Thomas Gleixner CC: Tom Lendacky CC: Vivek Goyal CC: Yaowei Bai CC: bhe@redhat.com CC: dan.j.williams@intel.com CC: dyoung@redhat.com CC: kexec@lists.infradead.org CC: mingo@redhat.com CC: x86-ml Link: http://lkml.kernel.org/r/153805812254.1157.16736368485811773752.stgit@bhelgaas-glaptop.roam.corp.google.com Signed-off-by: Sasha Levin --- kernel/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 30e1bc68503b5..155ec873ea4d1 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -319,7 +319,7 @@ int release_resource(struct resource *old) EXPORT_SYMBOL(release_resource); /* - * Finds the lowest iomem resource existing within [res->start.res->end). + * Finds the lowest iomem resource existing within [res->start..res->end]. * The caller must specify res->start, res->end, res->flags, and optionally * desc. If found, returns 0, res is overwritten, if not found, returns -1. * This function walks the whole tree and not just first level children until @@ -352,7 +352,7 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc, p = NULL; break; } - if ((p->end >= start) && (p->start < end)) + if ((p->end >= start) && (p->start <= end)) break; } -- 2.20.1