From: Mark Rutland <mark.rutland@arm.com>
To: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Subject: Re: [boot-wrapper PATCH] model.lds.S: Quote file paths
Date: Mon, 30 Jan 2023 14:41:58 +0000 [thread overview]
Message-ID: <Y9fXNqRtbJUJl4dv@FVFF77S0Q05N> (raw)
In-Reply-To: <20230102132446.2056889-1-kevin.brodsky@arm.com>
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 <kevin.brodsky@arm.com>
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
prev parent reply other threads:[~2023-01-30 17:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 13:24 [boot-wrapper PATCH] model.lds.S: Quote file paths Kevin Brodsky
2023-01-30 14:41 ` Mark Rutland [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y9fXNqRtbJUJl4dv@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=kevin.brodsky@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox