From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1038C54EED for ; Mon, 30 Jan 2023 17:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=C+s0AYZrDvEzCXQN3EqOPGerlR6F5w1j0N+aideT5Rc=; b=hiEmeswwFgHi3l HCLkONXdHQVKnSeJTN32w/CaDaoK5d9MPKofTVj19OZqeTGO5+d0Mx1PZrjTXcyQKlhatzyHCxopm gBdrORt9kRmxxpBMeDus8VmVNsSTW8JdQn5Swsfvq/p5PjlfssF0IHrgN0h6lzN20q7SJ9lgygWfa lQXxEQb5uNoTQLC0bEWweCWdX4tDZ4zgp+P+ZFlhP/Oa3m1Rc5+hRFGlHldKG0X1HzEiGVTXvlFvC 14iQW1fzWiAvCNu7kpS8OlI2bHvBF5bOfHGgklQ+GQk7d++NtjjAPsOZWbRWKRKUqiqD6pJZ6Kzm7 jsK43jPEuslmOyLLNi1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMXic-004RJ1-QQ; Mon, 30 Jan 2023 17:13:22 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMXgF-004QS6-V1 for linux-arm-kernel@lists.infradead.org; Mon, 30 Jan 2023 17:10:57 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 862D3175D; Mon, 30 Jan 2023 06:42:45 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.11.245]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D27DA3F882; Mon, 30 Jan 2023 06:42:02 -0800 (PST) Date: Mon, 30 Jan 2023 14:41:58 +0000 From: Mark Rutland To: Kevin Brodsky Cc: linux-arm-kernel@lists.infradead.org Subject: Re: [boot-wrapper PATCH] model.lds.S: Quote file paths Message-ID: References: <20230102132446.2056889-1-kevin.brodsky@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230102132446.2056889-1-kevin.brodsky@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230130_091056_062912_58B38E98 X-CRM114-Status: GOOD ( 16.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jan 02, 2023 at 01:24:46PM +0000, Kevin Brodsky wrote: > Inserting arbitrary paths in a linker script verbatim can be > problematic, even if they don't contain whitespaces, as ld has a > special interpretation for certain special characters (such as @). > > Fix this by quoting all user-provided paths in model.lds.S using the > preprocessor. > > Signed-off-by: Kevin Brodsky Thanks; applied. Mark. > --- > model.lds.S | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/model.lds.S b/model.lds.S > index dacaa25ba9fd..e07cbc04b9fa 100644 > --- a/model.lds.S > +++ b/model.lds.S > @@ -7,6 +7,9 @@ > * found in the LICENSE.txt file. > */ > > +#define _STR(s) #s > +#define STR(s) _STR(s) > + > #ifdef BOOTWRAPPER_32 > OUTPUT_FORMAT("elf32-littlearm") > OUTPUT_ARCH(arm) > @@ -17,13 +20,13 @@ OUTPUT_ARCH(aarch64) > TARGET(binary) > > #ifdef XEN > -INPUT(XEN) > +INPUT(STR(XEN)) > #endif > -INPUT(KERNEL) > +INPUT(STR(KERNEL)) > INPUT(./fdt.dtb) > > #ifdef USE_INITRD > -INPUT(FILESYSTEM) > +INPUT(STR(FILESYSTEM)) > #endif > > ENTRY(_start) > @@ -36,14 +39,14 @@ SECTIONS > */ > .kernel (PHYS_OFFSET + KERNEL_OFFSET): { > kernel__start = .; > - KERNEL > + STR(KERNEL) > kernel__end = .; > } > > #ifdef XEN > .xen (PHYS_OFFSET + XEN_OFFSET): { > xen__start = .; > - XEN > + STR(XEN) > xen__end = .; > } > > @@ -62,7 +65,7 @@ SECTIONS > #ifdef USE_INITRD > .filesystem (PHYS_OFFSET + FS_OFFSET): { > filesystem__start = .; > - FILESYSTEM > + STR(FILESYSTEM) > filesystem__end = .; > } > #endif > -- > 2.38.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel