From patchwork Mon Mar 18 05:52:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 1057692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44N5291yYdz9s9N for ; Mon, 18 Mar 2019 16:53:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 44N5286dzbzDqL2 for ; Mon, 18 Mar 2019 16:53:04 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 44N51b3vJlzDqHj for ; Mon, 18 Mar 2019 16:52:35 +1100 (AEDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2I5mmIA050856 for ; Mon, 18 Mar 2019 01:52:33 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ra5ax8f8v-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 18 Mar 2019 01:52:32 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 18 Mar 2019 05:52:31 -0000 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 18 Mar 2019 05:52:25 -0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2I5qOGi24051794 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Mar 2019 05:52:25 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D8307B2065 for ; Mon, 18 Mar 2019 05:52:24 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D343B205F for ; Mon, 18 Mar 2019 05:52:24 +0000 (GMT) Received: from birb.localdomain (unknown [9.81.212.133]) by b01ledav003.gho.pok.ibm.com (Postfix) with SMTP for ; Mon, 18 Mar 2019 05:52:24 +0000 (GMT) Received: by birb.localdomain (Postfix, from userid 1000) id C8EBA4E03A2; Mon, 18 Mar 2019 16:52:20 +1100 (AEDT) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Mon, 18 Mar 2019 16:52:19 +1100 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318055219.19029-1-stewart@linux.ibm.com> References: <20190318055219.19029-1-stewart@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19031805-0064-0000-0000-000003BBAD0E X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010778; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000281; SDB=6.01175986; UDB=6.00615064; IPR=6.00956670; MB=3.00026025; MTD=3.00000008; XFM=3.00000015; UTC=2019-03-18 05:52:30 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19031805-0065-0000-0000-00003CC19296 Message-Id: <20190318055219.19029-3-stewart@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-18_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903180045 Subject: [Skiboot] [PATCH 3/3] hdata: Prevent NULL dereference on duplicate slot map info X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Stewart Smith --- hdata/iohub.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hdata/iohub.c b/hdata/iohub.c index ad1ddae401f0..028fc6abdc0f 100644 --- a/hdata/iohub.c +++ b/hdata/iohub.c @@ -660,6 +660,10 @@ static void parse_one_slot(const struct slot_map_entry *entry, case st_rc_slot: node = dt_new_2addr(dt_slots, "root-complex", chip_id, entry->phb_index); + if (!node) { + SM_ERR("Couldn't add DT node\n"); + return; + } dt_add_property_cells(node, "reg", chip_id, entry->phb_index); dt_add_property_cells(node, "#address-cells", 2); dt_add_property_cells(node, "#size-cells", 0);