From patchwork Mon Sep 7 18:16:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1359184 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YLWJkz4O; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Blc3T5n9nz9sTK for ; Tue, 8 Sep 2020 04:18:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF27E8251B; Mon, 7 Sep 2020 20:17:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YLWJkz4O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C45782507; Mon, 7 Sep 2020 20:17:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 30646824FB for ; Mon, 7 Sep 2020 20:17:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x841.google.com with SMTP id z2so10254254qtv.12 for ; Mon, 07 Sep 2020 11:17:22 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=qrFwyKBkB/hNwmBWHaFxqD37Cm/8AFGYiJdPn6/ZQBY=; b=YLWJkz4ONNyKCBD959eUiN3bW5EKf/QU7MQEZoYjvnTnVQmNA7tjTWzVDZ7jbRbad8 z5V/dXfe3WGnHcdWTDIDPeVbT3ew3dyRxR+hChd/8nzrdptfO/EC/q5WB8Av/dG/vp0Z 6jjRHHjholQV2OdpKHw9h2pKsr6wHU4s0AqCFTGudyz57i8uFtn0jCw1vu4jx+g+1LBG Llnfs7TBSAmAOkpUnJYGv9xdGnk/j2+TNOAbibWA8Tebo1p5rL5lbwuv4gEG13PVxMKg GAn7vV75cFVWFQVjNblRTxpr7GHhlosCL5/TmoQ2qY9qz/HCj9YJH2BvQ3S8vOwRmCI+ tJ0Q== 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:mime-version:content-transfer-encoding; bh=qrFwyKBkB/hNwmBWHaFxqD37Cm/8AFGYiJdPn6/ZQBY=; b=FXyVsIsJTErCNmwsB2vucQlaBadGVUdVDwJv5+i2DPbQ2ehbKgBB7ylJ80Oj+wAFbj eidkrKvibnLZ9BX6FrcfLl5pYgaRehbAPKOnFVxeHlvCrk62+wGH71KgRUyh5IYtYMAg OVBiAKMzCUEPiiAd9+bTCwbvgmB+671+jk9xxueLKkvDJrGofJmOTD/4tPMeazFS0XFk FLotZSl0un2wg4OsWEg/YABQbG1YUYM91LAABhQWLUV5PFdQbWylxlacgG3JYnq5sC6g xA4AS2+/B3l0+vNVbZr8cvcQvAz1uBHdaCPDqmDILyISGye5bA/LJekkgZTalvdToOl9 VPfQ== X-Gm-Message-State: AOAM531pz5s9bOQ21UjWbdIaC9TUx11OuMObYARCcrnAevXskQ3kkwh9 hpsv0MT0yjOLz6freNgdrbcFXTFxOFB7MA== X-Google-Smtp-Source: ABdhPJwwzujmn0PrPChNUMOAyxj6QMavHcYylgB11aMDZUSyJIcN5FYrlrKHBylFZo9US2ElMFftZg== X-Received: by 2002:ac8:6f21:: with SMTP id i1mr5608411qtv.89.1599502640891; Mon, 07 Sep 2020 11:17:20 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id w3sm11577212qkc.10.2020.09.07.11.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 11:17:20 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Rick Chen , Heinrich Schuchardt , Bin Meng , Sean Anderson Subject: [PATCH 6/7] riscv: Ensure gp is NULL or points to valid data Date: Mon, 7 Sep 2020 14:16:58 -0400 Message-Id: <20200907181659.92449-7-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907181659.92449-1-seanga2@gmail.com> References: <20200907181659.92449-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This allows code to use a construct like `if (gd & gd->...) { ... }` when accessing the global data pointer. Without this change, it was possible for a very early trap to cause _exit_trap to read arbitrary memory. This could cause a second trap, preventing show_regs from being printed. Fixes: 7c6ca03eaed0035ca6676e9bc7f5f1dfcaae7e8f Signed-off-by: Sean Anderson --- arch/riscv/cpu/start.S | 20 +++++++++++++++++--- arch/riscv/lib/interrupts.c | 3 ++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index ad18e746b6..59d3d7bbf4 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -47,6 +47,13 @@ _start: mv tp, a0 mv s1, a1 + /* + * Set the global data pointer to a known value in case we get a very + * early trap. The global data pointer will be set its actual value only + * after it has been initialized. + */ + mv gp, zero + la t0, trap_entry csrw MODE_PREFIX(tvec), t0 @@ -85,10 +92,10 @@ call_board_init_f_0: jal board_init_f_alloc_reserve /* - * Set global data pointer here for all harts, uninitialized at this - * point. + * Save global data pointer for later. We don't set it here because it + * is not initialized yet. */ - mv gp, a0 + mv s0, a0 /* setup stack */ #if CONFIG_IS_ENABLED(SMP) @@ -135,6 +142,13 @@ wait_for_gd_init: fence r, rw bnez t1, 1b + /* + * Set the global data pointer only when gd_t has been initialized. + * This was already set by arch_setup_gd on the boot hart, but all other + * harts' global data pointers gets set here. + */ + mv gp, s0 + /* register available harts in the available_harts mask */ li t1, 1 sll t1, t1, tp diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index cd47e64487..ad870e98d8 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -78,7 +78,8 @@ static void _exit_trap(ulong code, ulong epc, ulong tval, struct pt_regs *regs) printf("EPC: " REG_FMT " RA: " REG_FMT " TVAL: " REG_FMT "\n", epc, regs->ra, tval); - if (gd->flags & GD_FLG_RELOC) + /* Print relocation adjustments, but only if gd is initialized */ + if (gd && gd->flags & GD_FLG_RELOC) printf("EPC: " REG_FMT " RA: " REG_FMT " reloc adjusted\n\n", epc - gd->reloc_off, regs->ra - gd->reloc_off);