From patchwork Thu Mar 23 06:15:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 742487 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vpbsC3Wrqz9s7v for ; Thu, 23 Mar 2017 17:15:59 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vpbsC2nR4zDqZy for ; Thu, 23 Mar 2017 17:15:59 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vpbrY34sTzDq95 for ; Thu, 23 Mar 2017 17:15:25 +1100 (AEDT) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3vpbrY1RXLz9s83; Thu, 23 Mar 2017 17:15:25 +1100 (AEDT) Received: by localhost.localdomain (Postfix, from userid 1000) id 4F48EEEEE29; Thu, 23 Mar 2017 17:15:25 +1100 (AEDT) From: Michael Neuling To: stewart@linux.vnet.ibm.com Date: Thu, 23 Mar 2017 17:15:07 +1100 Message-Id: <20170323061509.4231-3-mikey@neuling.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170323061509.4231-1-mikey@neuling.org> References: <20170323061509.4231-1-mikey@neuling.org> Subject: [Skiboot] [PATCH v2 3/5] xscom: Harden indirect writes X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: skiboot@lists.ozlabs.org, mikey@neuling.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Indirect scoms can only set certain bits of data. Ensure only these are set when trying to write. Signed-off-by: Michael Neuling Reviewed-by: Cédric Le Goater --- hw/xscom.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/xscom.c b/hw/xscom.c index 6fde427f1e..b0bc260087 100644 --- a/hw/xscom.c +++ b/hw/xscom.c @@ -369,6 +369,10 @@ static int xscom_indirect_write(uint32_t gcid, uint64_t pcb_addr, uint64_t val) if (proc_gen < proc_gen_p8) return OPAL_UNSUPPORTED; + /* Only 16 bit data with indirect */ + if (val & ~(XSCOM_ADDR_IND_DATA)) + return OPAL_PARAMETER; + /* Write indirect address & data */ addr = pcb_addr & 0x7fffffff; data = pcb_addr & XSCOM_ADDR_IND_ADDR;