From patchwork Wed Sep 9 05:54:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 515703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8BCC3140549 for ; Wed, 9 Sep 2015 15:55:05 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 545A11A2BDF for ; Wed, 9 Sep 2015 15:55:05 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 07C6E1A2BB0 for ; Wed, 9 Sep 2015 15:54:24 +1000 (AEST) Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Sep 2015 23:54:22 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Sep 2015 23:54:20 -0600 X-Helo: d03dlp01.boulder.ibm.com X-MailFrom: stewart@linux.vnet.ibm.com X-RcptTo: skiboot@lists.ozlabs.org Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id DEAFD1FF0042 for ; Tue, 8 Sep 2015 23:45:28 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t895rVAg20971680 for ; Tue, 8 Sep 2015 22:53:31 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t895sJZX026884 for ; Tue, 8 Sep 2015 23:54:19 -0600 Received: from oc8180480414.ibm.com ([9.185.49.210]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t895sIIg026848; Tue, 8 Sep 2015 23:54:18 -0600 Received: from ka1.ozlabs.ibm.com (localhost [127.0.0.1]) by oc8180480414.ibm.com (Postfix) with ESMTP id 567B97F07; Wed, 9 Sep 2015 15:54:17 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Wed, 9 Sep 2015 15:54:11 +1000 Message-Id: <1441778053-31745-2-git-send-email-stewart@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441778053-31745-1-git-send-email-stewart@linux.vnet.ibm.com> References: <1441778053-31745-1-git-send-email-stewart@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15090905-0033-0000-0000-000005CCDB1A Subject: [Skiboot] [PATCH 2/4] Assert that memory allocation succeeds in mem_region_add_dt_reserved_node() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" If we fail to allocate memory at this point in boot, we should just assert, there's really no coming back from not being able to reserve our reserved memory. Signed-off-by: Stewart Smith --- core/mem_region.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/mem_region.c b/core/mem_region.c index a742fe4..f6a52a0 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -1078,6 +1078,7 @@ static void mem_region_add_dt_reserved_node(struct dt_node *parent, } name = strdup(region->name); + assert(name); /* remove any cell addresses in the region name; we have our own cell * addresses here */ @@ -1086,6 +1087,7 @@ static void mem_region_add_dt_reserved_node(struct dt_node *parent, *p = '\0'; region->node = dt_new_addr(parent, name, region->start); + assert(region->node); dt_add_property_u64s(region->node, "reg", region->start, region->len); free(name); }