Re: [PATCH] Don't generate erroneous fixups from reference to path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]



On Sun, Jul 31, 2022 at 10:11:00PM +1000, David Gibson wrote:
> The dtb overlay format only permits (non local) fixups to reference labels,
> not paths.  That's because the fixup target goes into the property name in
> the overlay, and property names aren't permitted to include '/' characters.
> 
> Stop erroneously generating such fixups, because we didn't check for this
> case.
> 
> Signed-off-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>

Well.. I guess I'll take no response as assent.  Applied to main
branch.

> ---
>  livetree.c                  | 6 ++++++
>  tests/fixup-ref-to-path.dts | 6 ++++++
>  tests/run_tests.sh          | 1 +
>  3 files changed, 13 insertions(+)
>  create mode 100644 tests/fixup-ref-to-path.dts
> 
> diff --git a/livetree.c b/livetree.c
> index 169462d..f46a098 100644
> --- a/livetree.c
> +++ b/livetree.c
> @@ -919,6 +919,12 @@ static void add_fixup_entry(struct dt_info *dti, struct node *fn,
>  	/* m->ref can only be a REF_PHANDLE, but check anyway */
>  	assert(m->type == REF_PHANDLE);
>  
> +	/* The format only permits fixups for references to label, not
> +	 * references to path */
> +	if (strchr(m->ref, '/'))
> +		die("Can't generate fixup for reference to path &{%s}\n",
> +		    m->ref);
> +
>  	/* there shouldn't be any ':' in the arguments */
>  	if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
>  		die("arguments should not contain ':'\n");
> diff --git a/tests/fixup-ref-to-path.dts b/tests/fixup-ref-to-path.dts
> new file mode 100644
> index 0000000..f6dcba0
> --- /dev/null
> +++ b/tests/fixup-ref-to-path.dts
> @@ -0,0 +1,6 @@
> +/dts-v1/;
> +/plugin/;
> +
> +/ {
> +	prop = < &{/path/to/node} >;
> +};
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index 0cabd13..244df8a 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -271,6 +271,7 @@ libfdt_overlay_tests () {
>  	run_dtc_test -I dts -O dtb -o $tree.test.dtb "$SRCDIR/$tree.dts"
>  	run_test overlay_bad_fixup overlay_base_no_symbols.test.dtb $tree.test.dtb
>      done
> +    run_sh_test "$SRCDIR/dtc-fatal.sh" -I dts -O dtb -o /dev/null fixup-ref-to-path.dts
>  }
>  
>  # Tests to exercise dtc's overlay generation support

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Attachment: signature.asc
Description: PGP signature


[Index of Archives]     [Device Tree]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux