From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 May 2024 08:23:00 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s7qzc-000uMJ-1b for lore@lore.pengutronix.de; Fri, 17 May 2024 08:23:00 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s7qzb-0003ht-UU for lore@pengutronix.de; Fri, 17 May 2024 08:23:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JASKyne0q+Klhk9jV2YaI1gXHtR30lGV0V0hM7S8BIw=; b=nBFN/VhaNQSkWQTC8tZPyI6mnu h5tNl2fL7ChVc5DSDvh6y22l0AFtpVtWuj72Db85j7zXhtxuqMFNIIb5i05jnqYVVIS5f+yMDrW1d oOJ485puTbjQBDNqGpJHJr/de6jZUTry5Rruw9TQCvvBJWCpo9lOvppHDG9lrQpxGn/iJ77BsE8zk h6sE21yFtJ7fB//93Q2Caui/sgf8Y71TCR+T4vTXOqh4vFeJmiKU8d17wAd/X1MipfnhsP9HKoEtb zn69xsXiG2tVS+Qvz7nu6eZXKebI6HFn3CuHB7A7rDdm+nFWovAjKZhvXe6w+2kJopuJ+G32FLCBv 13g8z8ZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s7qz9-00000006wMZ-2uWT; Fri, 17 May 2024 06:22:31 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s7qz6-00000006wKb-0Uwc for barebox@lists.infradead.org; Fri, 17 May 2024 06:22:30 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s7qz4-0003U4-ST; Fri, 17 May 2024 08:22:26 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1s7qz4-001pZp-Ft; Fri, 17 May 2024 08:22:26 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1s7qz4-00Dr1y-1J; Fri, 17 May 2024 08:22:26 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Fri, 17 May 2024 08:22:25 +0200 Message-Id: <20240517062225.3302101-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240517062225.3302101-1-a.fatoum@pengutronix.de> References: <20240517062225.3302101-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240516_232228_190376_FF3644FB X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.6 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master 2/2] RISC-V: start: align uncompressed DTB size to 4 bytes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On ARM, I ran into a KASAN splat, because the uncompressed DT may not have a 4-byte aligned size. This can affect RISC-V boards too, so import the fix done there. Signed-off-by: Ahmad Fatoum --- arch/riscv/boot/start.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/boot/start.c b/arch/riscv/boot/start.c index 92991d0f6a84..d20526293bac 100644 --- a/arch/riscv/boot/start.c +++ b/arch/riscv/boot/start.c @@ -54,7 +54,7 @@ void *barebox_riscv_boot_dtb(void) pr_debug("%s: using compressed_dtb\n", __func__); - dtb = malloc(compressed_dtb->datalen_uncompressed); + dtb = malloc(ALIGN(compressed_dtb->datalen_uncompressed, 4)); if (!dtb) return NULL; -- 2.39.2