Message ID | 20181117091818.15393-2-simon.k.r.goldschmidt@gmail.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SbLup1Wg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42xqKB6pyrz9s5c for <incoming@patchwork.ozlabs.org>; Sat, 17 Nov 2018 20:18:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A8CF9C220CD; Sat, 17 Nov 2018 09:18:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 138CFC220CD; Sat, 17 Nov 2018 09:18:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7E187C220CD; Sat, 17 Nov 2018 09:18:31 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id 29216C22014 for <u-boot@lists.denx.de>; Sat, 17 Nov 2018 09:18:31 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id g131so383330wmg.3 for <u-boot@lists.denx.de>; Sat, 17 Nov 2018 01:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MnHQ79G65Wy9lKRoKnQ8YC6XLpvneApKcFzCmAJ8X8Q=; b=SbLup1WgnooMYDXEODz9IwI44rZ4u0G+iWzbXpe8MiMVRciuyt8LOhG4zOizyfY3JN YsA3TpDdg1LTws6MbUpA5UzyRrlkddBko10VALaApVsaPPH7JPVnhyLhnxOtvH3rIEWr GVcaw6XwE2J7+0AE9EAD1tkwoSv9K1Uj5G+1rDvt4vtPjFOFgz0A9g9esD2Zw22L+IEQ FndnfGG4r9n0S0kgEK0J113b6byJa4PUbaRlROOXtWrJXaApvwf1Q0238O0u9hII4kBG 4Lh5DT8ydoLsvYZYXWKBlYUjW5T/oDpi6zM5WBRp+GWtlwjNadS5SOnrywYKQQKFro3G UwNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MnHQ79G65Wy9lKRoKnQ8YC6XLpvneApKcFzCmAJ8X8Q=; b=FcDW7Qd0cj/vIh/V4b9pNPqUmY5QemeeGOBz5JLvb4r5ev+Z3pHAMqv/Kl4ebVLp6i BZrKpLQ0xFh9u1KBJVjwcvd56I23Pipa8lqWmKqBLM45xTLiU6ckEwvXYdbmd7LTvIsk augNTmmgDZSIdvGesAylnZ+k/ITUYjZhw78A6DkTcpOYmBogfkmxysi/fZqoQNvt5QSw eEtATzLGBrbr2eP95D3pRZdClaEKDH2oJvQOhG4AMDcJGnJog7eG7wpqo90O4klZ5cxn 4KDH/6DR68YebdTIFaeWEbSd/mUKPbi7gSMBonOrMprBg0a2kle4bezrycw8YrbEsdH0 F8yQ== X-Gm-Message-State: AGRZ1gLvKcNEsMiLJ1ImTHjTmCxss9iOE2pQFepZPAnUq96u7nr+BIXh htn6zNIQtrQyxyiQCEGPIFk= X-Google-Smtp-Source: AFSGD/UTqBNqUvGBPlQB7ND5KW2w4g/kWIxvau5+P9u6DJOfQmXcVKB+YM9zN5xxXn7BlXqWjgt96Q== X-Received: by 2002:a1c:9f01:: with SMTP id i1-v6mr1139336wme.8.1542446310736; Sat, 17 Nov 2018 01:18:30 -0800 (PST) Received: from ubuntu.home ([2a02:8071:6a3:700:456c:50ae:6b7:768d]) by smtp.gmail.com with ESMTPSA id f18-v6sm30027642wre.57.2018.11.17.01.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Nov 2018 01:18:29 -0800 (PST) From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> To: Tom Rini <trini@konsulko.com>, u-boot@lists.denx.de, Joe Hershberger <joe.hershberger@ni.com> Date: Sat, 17 Nov 2018 10:18:11 +0100 Message-Id: <20181117091818.15393-2-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181117091818.15393-1-simon.k.r.goldschmidt@gmail.com> References: <20181117091818.15393-1-simon.k.r.goldschmidt@gmail.com> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>, Andrea Barisani <andrea.barisani@f-secure.com> Subject: [U-Boot] [PATCH v2 1/8] lib: lmb: reserving overlapping regions should fail X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
[U-Boot,v2,1/8] lib: lmb: reserving overlapping regions should fail
|
expand
|
diff --git a/lib/lmb.c b/lib/lmb.c index 1705417348..8dc703d996 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -136,6 +136,9 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t rgn->region[i].size += size; coalesced++; break; + } else if (lmb_addrs_overlap(base, size, rgnbase, rgnsize)) { + /* regions overlap */ + return -1; } }
lmb_add_region handles overlapping regions wrong: instead of merging or rejecting to add a new reserved region that overlaps an existing one, it just adds the new region. Since internally the same function is used for lmb_alloc, change lmb_add_region to reject overlapping regions. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> --- Changes in v2: None lib/lmb.c | 3 +++ 1 file changed, 3 insertions(+)