All of lore.kernel.org
 help / color / mirror / Atom feed
* mkimage regression when building ARCH=mips defconfig Linux kernel
@ 2021-04-08 18:22 ` Nathan Chancellor
  0 siblings, 0 replies; 9+ messages in thread
From: Nathan Chancellor @ 2021-04-08 18:22 UTC (permalink / raw)
  To: Simon Glass, Thomas Bogendoerfer; +Cc: u-boot, linux-mips

Hi Simon,

Apologies if this is not the proper way to report a regression, this is my first
time interacting with the U-Boot community.

My distribution updated the uboot-tools package to 2021.04, which broke my
Linux kernel builds for ARCH=mips:

$ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
...
/usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
...

I bisected this down to your commit:

3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
commit 3f04db891a353f4b127ed57279279f851c6b4917
Author: Simon Glass <sjg@chromium.org>
Date:   Mon Feb 15 17:08:12 2021 -0700

    image: Check for unit addresses in FITs

    Using unit addresses in a FIT is a security risk. Add a check for this
    and disallow it.

    CVE-2021-27138

    Signed-off-by: Simon Glass <sjg@chromium.org>
    Reported-by: Bruce Monroe <bruce.monroe@intel.com>
    Reported-by: Arie Haenel <arie.haenel@intel.com>
    Reported-by: Julien Lenoir <julien.lenoir@intel.com>

 common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
 test/py/tests/test_vboot.py |  9 ++++----
 2 files changed, 57 insertions(+), 8 deletions(-)
bisect run success

$ git bisect log
# bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
# good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
# good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
# bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
# bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
# good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
# bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
# bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
git bisect bad aeedeae40733131467de72c68e639cf9d795e059
# bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
# bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
# bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
# good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
# good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
# first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs

Is this an actual regression or is this now the expected behavior? I have added
Thomas and the linux-mips mailing list to take a look and see if the Linux
kernel needs to have its sources updated.

Cheers,
Nathan

^ permalink raw reply	[flat|nested] 9+ messages in thread
* mkimage regression when building ARCH=mips defconfig Linux kernel
@ 2021-04-08 18:22 ` Nathan Chancellor
  0 siblings, 0 replies; 9+ messages in thread
From: Nathan Chancellor @ 2021-04-08 18:22 UTC (permalink / raw)
  To: u-boot

Hi Simon,

Apologies if this is not the proper way to report a regression, this is my first
time interacting with the U-Boot community.

My distribution updated the uboot-tools package to 2021.04, which broke my
Linux kernel builds for ARCH=mips:

$ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
...
/usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
...

I bisected this down to your commit:

3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
commit 3f04db891a353f4b127ed57279279f851c6b4917
Author: Simon Glass <sjg@chromium.org>
Date:   Mon Feb 15 17:08:12 2021 -0700

    image: Check for unit addresses in FITs

    Using unit addresses in a FIT is a security risk. Add a check for this
    and disallow it.

    CVE-2021-27138

    Signed-off-by: Simon Glass <sjg@chromium.org>
    Reported-by: Bruce Monroe <bruce.monroe@intel.com>
    Reported-by: Arie Haenel <arie.haenel@intel.com>
    Reported-by: Julien Lenoir <julien.lenoir@intel.com>

 common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
 test/py/tests/test_vboot.py |  9 ++++----
 2 files changed, 57 insertions(+), 8 deletions(-)
bisect run success

$ git bisect log
# bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
# good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
# good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
# bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
# bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
# good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
# bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
# bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
git bisect bad aeedeae40733131467de72c68e639cf9d795e059
# bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
# bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
# bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
# good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
# good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
# first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs

Is this an actual regression or is this now the expected behavior? I have added
Thomas and the linux-mips mailing list to take a look and see if the Linux
kernel needs to have its sources updated.

Cheers,
Nathan

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: mkimage regression when building ARCH=mips defconfig Linux kernel
  2021-04-08 18:22 ` Nathan Chancellor
@ 2021-04-08 23:55   ` Simon Glass
  -1 siblings, 0 replies; 9+ messages in thread
From: Simon Glass @ 2021-04-08 23:55 UTC (permalink / raw)
  To: Nathan Chancellor, Tom Rini
  Cc: Thomas Bogendoerfer, U-Boot Mailing List, linux-mips

+Tom Rini

Hi Nathan,

On Fri, 9 Apr 2021 at 06:23, Nathan Chancellor <nathan@kernel.org> wrote:
>
> Hi Simon,
>
> Apologies if this is not the proper way to report a regression, this is my first
> time interacting with the U-Boot community.
>
> My distribution updated the uboot-tools package to 2021.04, which broke my
> Linux kernel builds for ARCH=mips:
>
> $ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
> ...
> /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
> ...
>
> I bisected this down to your commit:
>
> 3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
> commit 3f04db891a353f4b127ed57279279f851c6b4917
> Author: Simon Glass <sjg@chromium.org>
> Date:   Mon Feb 15 17:08:12 2021 -0700
>
>     image: Check for unit addresses in FITs
>
>     Using unit addresses in a FIT is a security risk. Add a check for this
>     and disallow it.
>
>     CVE-2021-27138
>
>     Signed-off-by: Simon Glass <sjg@chromium.org>
>     Reported-by: Bruce Monroe <bruce.monroe@intel.com>
>     Reported-by: Arie Haenel <arie.haenel@intel.com>
>     Reported-by: Julien Lenoir <julien.lenoir@intel.com>
>
>  common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
>  test/py/tests/test_vboot.py |  9 ++++----
>  2 files changed, 57 insertions(+), 8 deletions(-)
> bisect run success
>
> $ git bisect log
> # bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
> # good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
> git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
> # good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
> git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
> # bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
> git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
> # bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
> git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
> # good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
> git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
> # bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
> git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
> # bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
> git bisect bad aeedeae40733131467de72c68e639cf9d795e059
> # bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
> git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
> # bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
> git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
> # bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
> # good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
> git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
> # good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
> git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
> # first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
>
> Is this an actual regression or is this now the expected behavior? I have added
> Thomas and the linux-mips mailing list to take a look and see if the Linux
> kernel needs to have its sources updated.

It is expected. See the code in that commit:

      /*
       * U-Boot stopped using unit addressed in 2017. Since libfdt
       * can match nodes ignoring any unit address, signature
       * verification can see the wrong node if one is inserted with
       * the same name as a valid node but with a unit address
       * attached. Protect against this by disallowing unit addresses.
       */
      if (!ret && CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
         ret = fdt_check_no_at(fit, 0);

         if (ret) {
            log_debug("FIT check error %d\n", ret);
            return ret;
         }
      }

Possibly you are using @ nodes in your FIT files in the kernel. Is it
possible to use a hyphen instead?

Regards,
Simon

^ permalink raw reply	[flat|nested] 9+ messages in thread
* mkimage regression when building ARCH=mips defconfig Linux kernel
@ 2021-04-08 23:55   ` Simon Glass
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Glass @ 2021-04-08 23:55 UTC (permalink / raw)
  To: u-boot

+Tom Rini

Hi Nathan,

On Fri, 9 Apr 2021 at 06:23, Nathan Chancellor <nathan@kernel.org> wrote:
>
> Hi Simon,
>
> Apologies if this is not the proper way to report a regression, this is my first
> time interacting with the U-Boot community.
>
> My distribution updated the uboot-tools package to 2021.04, which broke my
> Linux kernel builds for ARCH=mips:
>
> $ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
> ...
> /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
> ...
>
> I bisected this down to your commit:
>
> 3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
> commit 3f04db891a353f4b127ed57279279f851c6b4917
> Author: Simon Glass <sjg@chromium.org>
> Date:   Mon Feb 15 17:08:12 2021 -0700
>
>     image: Check for unit addresses in FITs
>
>     Using unit addresses in a FIT is a security risk. Add a check for this
>     and disallow it.
>
>     CVE-2021-27138
>
>     Signed-off-by: Simon Glass <sjg@chromium.org>
>     Reported-by: Bruce Monroe <bruce.monroe@intel.com>
>     Reported-by: Arie Haenel <arie.haenel@intel.com>
>     Reported-by: Julien Lenoir <julien.lenoir@intel.com>
>
>  common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
>  test/py/tests/test_vboot.py |  9 ++++----
>  2 files changed, 57 insertions(+), 8 deletions(-)
> bisect run success
>
> $ git bisect log
> # bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
> # good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
> git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
> # good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
> git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
> # bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
> git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
> # bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
> git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
> # good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
> git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
> # bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
> git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
> # bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
> git bisect bad aeedeae40733131467de72c68e639cf9d795e059
> # bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
> git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
> # bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
> git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
> # bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
> # good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
> git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
> # good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
> git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
> # first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
>
> Is this an actual regression or is this now the expected behavior? I have added
> Thomas and the linux-mips mailing list to take a look and see if the Linux
> kernel needs to have its sources updated.

It is expected. See the code in that commit:

      /*
       * U-Boot stopped using unit addressed in 2017. Since libfdt
       * can match nodes ignoring any unit address, signature
       * verification can see the wrong node if one is inserted with
       * the same name as a valid node but with a unit address
       * attached. Protect against this by disallowing unit addresses.
       */
      if (!ret && CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
         ret = fdt_check_no_at(fit, 0);

         if (ret) {
            log_debug("FIT check error %d\n", ret);
            return ret;
         }
      }

Possibly you are using @ nodes in your FIT files in the kernel. Is it
possible to use a hyphen instead?

Regards,
Simon

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: mkimage regression when building ARCH=mips defconfig Linux kernel
  2021-04-08 23:55   ` Simon Glass
@ 2021-04-09 17:47     ` Tom Rini
  -1 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2021-04-09 17:47 UTC (permalink / raw)
  To: Simon Glass
  Cc: Nathan Chancellor, Thomas Bogendoerfer, U-Boot Mailing List, linux-mips

[-- Attachment #1: Type: text/plain, Size: 5056 bytes --]

On Fri, Apr 09, 2021 at 11:55:52AM +1200, Simon Glass wrote:
> +Tom Rini
> 
> Hi Nathan,
> 
> On Fri, 9 Apr 2021 at 06:23, Nathan Chancellor <nathan@kernel.org> wrote:
> >
> > Hi Simon,
> >
> > Apologies if this is not the proper way to report a regression, this is my first
> > time interacting with the U-Boot community.
> >
> > My distribution updated the uboot-tools package to 2021.04, which broke my
> > Linux kernel builds for ARCH=mips:
> >
> > $ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
> > ...
> > /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> > make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
> > ...
> >
> > I bisected this down to your commit:
> >
> > 3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
> > commit 3f04db891a353f4b127ed57279279f851c6b4917
> > Author: Simon Glass <sjg@chromium.org>
> > Date:   Mon Feb 15 17:08:12 2021 -0700
> >
> >     image: Check for unit addresses in FITs
> >
> >     Using unit addresses in a FIT is a security risk. Add a check for this
> >     and disallow it.
> >
> >     CVE-2021-27138
> >
> >     Signed-off-by: Simon Glass <sjg@chromium.org>
> >     Reported-by: Bruce Monroe <bruce.monroe@intel.com>
> >     Reported-by: Arie Haenel <arie.haenel@intel.com>
> >     Reported-by: Julien Lenoir <julien.lenoir@intel.com>
> >
> >  common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
> >  test/py/tests/test_vboot.py |  9 ++++----
> >  2 files changed, 57 insertions(+), 8 deletions(-)
> > bisect run success
> >
> > $ git bisect log
> > # bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
> > # good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
> > git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
> > # good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
> > git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
> > # bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
> > git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
> > # bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
> > git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
> > # good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
> > git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
> > # bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
> > git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
> > # bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
> > git bisect bad aeedeae40733131467de72c68e639cf9d795e059
> > # bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
> > git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
> > # bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
> > git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
> > # bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> > git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
> > # good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
> > git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
> > # good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
> > git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
> > # first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> >
> > Is this an actual regression or is this now the expected behavior? I have added
> > Thomas and the linux-mips mailing list to take a look and see if the Linux
> > kernel needs to have its sources updated.
> 
> It is expected. See the code in that commit:
> 
>       /*
>        * U-Boot stopped using unit addressed in 2017. Since libfdt
>        * can match nodes ignoring any unit address, signature
>        * verification can see the wrong node if one is inserted with
>        * the same name as a valid node but with a unit address
>        * attached. Protect against this by disallowing unit addresses.
>        */
>       if (!ret && CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
>          ret = fdt_check_no_at(fit, 0);
> 
>          if (ret) {
>             log_debug("FIT check error %d\n", ret);
>             return ret;
>          }
>       }
> 
> Possibly you are using @ nodes in your FIT files in the kernel. Is it
> possible to use a hyphen instead?

Yeah, it looks like arch/mips/generic/*.its.S in the kernel will need to
be updated.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* mkimage regression when building ARCH=mips defconfig Linux kernel
@ 2021-04-09 17:47     ` Tom Rini
  0 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2021-04-09 17:47 UTC (permalink / raw)
  To: u-boot

On Fri, Apr 09, 2021 at 11:55:52AM +1200, Simon Glass wrote:
> +Tom Rini
> 
> Hi Nathan,
> 
> On Fri, 9 Apr 2021 at 06:23, Nathan Chancellor <nathan@kernel.org> wrote:
> >
> > Hi Simon,
> >
> > Apologies if this is not the proper way to report a regression, this is my first
> > time interacting with the U-Boot community.
> >
> > My distribution updated the uboot-tools package to 2021.04, which broke my
> > Linux kernel builds for ARCH=mips:
> >
> > $ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all
> > ...
> > /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> > make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1
> > ...
> >
> > I bisected this down to your commit:
> >
> > 3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit
> > commit 3f04db891a353f4b127ed57279279f851c6b4917
> > Author: Simon Glass <sjg@chromium.org>
> > Date:   Mon Feb 15 17:08:12 2021 -0700
> >
> >     image: Check for unit addresses in FITs
> >
> >     Using unit addresses in a FIT is a security risk. Add a check for this
> >     and disallow it.
> >
> >     CVE-2021-27138
> >
> >     Signed-off-by: Simon Glass <sjg@chromium.org>
> >     Reported-by: Bruce Monroe <bruce.monroe@intel.com>
> >     Reported-by: Arie Haenel <arie.haenel@intel.com>
> >     Reported-by: Julien Lenoir <julien.lenoir@intel.com>
> >
> >  common/image-fit.c          | 56 +++++++++++++++++++++++++++++++++++++++++----
> >  test/py/tests/test_vboot.py |  9 ++++----
> >  2 files changed, 57 insertions(+), 8 deletions(-)
> > bisect run success
> >
> > $ git bisect log
> > # bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements'
> > # good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01
> > git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01'
> > # good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1
> > git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1
> > # bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning
> > git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd
> > # bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
> > git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e
> > # good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks
> > git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356
> > # bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
> > git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb
> > # bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs
> > git bisect bad aeedeae40733131467de72c68e639cf9d795e059
> > # bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped
> > git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e
> > # bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if
> > git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a
> > # bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> > git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917
> > # good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT
> > git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01
> > # good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes
> > git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d
> > # first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs
> >
> > Is this an actual regression or is this now the expected behavior? I have added
> > Thomas and the linux-mips mailing list to take a look and see if the Linux
> > kernel needs to have its sources updated.
> 
> It is expected. See the code in that commit:
> 
>       /*
>        * U-Boot stopped using unit addressed in 2017. Since libfdt
>        * can match nodes ignoring any unit address, signature
>        * verification can see the wrong node if one is inserted with
>        * the same name as a valid node but with a unit address
>        * attached. Protect against this by disallowing unit addresses.
>        */
>       if (!ret && CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
>          ret = fdt_check_no_at(fit, 0);
> 
>          if (ret) {
>             log_debug("FIT check error %d\n", ret);
>             return ret;
>          }
>       }
> 
> Possibly you are using @ nodes in your FIT files in the kernel. Is it
> possible to use a hyphen instead?

Yeah, it looks like arch/mips/generic/*.its.S in the kernel will need to
be updated.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210409/96ba943c/attachment.sig>

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] MIPS: generic: Update node names to avoid unit addresses
  2021-04-09 17:47     ` Tom Rini
  (?)
@ 2021-04-09 19:21     ` Nathan Chancellor
  2021-04-09 19:41       ` Tom Rini
  2021-04-12 15:05       ` Thomas Bogendoerfer
  -1 siblings, 2 replies; 9+ messages in thread
From: Nathan Chancellor @ 2021-04-09 19:21 UTC (permalink / raw)
  To: Paul Burton, Thomas Bogendoerfer
  Cc: Tom Rini, Simon Glass, linux-mips, linux-kernel,
	Nathan Chancellor, stable

With the latest mkimage from U-Boot 2021.04, the generic defconfigs no
longer build, failing with:

/usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1

This is expected after the linked U-Boot commits because '@' is
forbidden in the node names due to the way that libfdt treats nodes with
the same prefix but different unit addresses.

Switch the '@' in the node name to '-'. Drop the unit addresses from the
hash and kernel child nodes because there is only one node so they do
not need to have a number to differentiate them.

Cc: stable@vger.kernel.org
Link: https://source.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4
Link: https://source.denx.de/u-boot/u-boot/-/commit/3f04db891a353f4b127ed57279279f851c6b4917
Suggested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 arch/mips/generic/board-boston.its.S   | 10 +++++-----
 arch/mips/generic/board-jaguar2.its.S  | 16 ++++++++--------
 arch/mips/generic/board-luton.its.S    |  8 ++++----
 arch/mips/generic/board-ni169445.its.S | 10 +++++-----
 arch/mips/generic/board-ocelot.its.S   | 20 ++++++++++----------
 arch/mips/generic/board-serval.its.S   |  8 ++++----
 arch/mips/generic/board-xilfpga.its.S  | 10 +++++-----
 arch/mips/generic/vmlinux.its.S        | 10 +++++-----
 8 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/arch/mips/generic/board-boston.its.S b/arch/mips/generic/board-boston.its.S
index a7f51f97b910..c45ad2759421 100644
--- a/arch/mips/generic/board-boston.its.S
+++ b/arch/mips/generic/board-boston.its.S
@@ -1,22 +1,22 @@
 / {
 	images {
-		fdt@boston {
+		fdt-boston {
 			description = "img,boston Device Tree";
 			data = /incbin/("boot/dts/img/boston.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 	};
 
 	configurations {
-		conf@boston {
+		conf-boston {
 			description = "Boston Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@boston";
+			kernel = "kernel";
+			fdt = "fdt-boston";
 		};
 	};
 };
diff --git a/arch/mips/generic/board-jaguar2.its.S b/arch/mips/generic/board-jaguar2.its.S
index fb0e589eeff7..c2b8d479b26c 100644
--- a/arch/mips/generic/board-jaguar2.its.S
+++ b/arch/mips/generic/board-jaguar2.its.S
@@ -1,23 +1,23 @@
 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
 / {
 	images {
-		fdt@jaguar2_pcb110 {
+		fdt-jaguar2_pcb110 {
 			description = "MSCC Jaguar2 PCB110 Device Tree";
 			data = /incbin/("boot/dts/mscc/jaguar2_pcb110.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
-		fdt@jaguar2_pcb111 {
+		fdt-jaguar2_pcb111 {
 			description = "MSCC Jaguar2 PCB111 Device Tree";
 			data = /incbin/("boot/dts/mscc/jaguar2_pcb111.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
@@ -26,14 +26,14 @@
 	configurations {
 		pcb110 {
 			description = "Jaguar2 Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@jaguar2_pcb110";
+			kernel = "kernel";
+			fdt = "fdt-jaguar2_pcb110";
 			ramdisk = "ramdisk";
 		};
 		pcb111 {
 			description = "Jaguar2 Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@jaguar2_pcb111";
+			kernel = "kernel";
+			fdt = "fdt-jaguar2_pcb111";
 			ramdisk = "ramdisk";
 		};
 	};
diff --git a/arch/mips/generic/board-luton.its.S b/arch/mips/generic/board-luton.its.S
index 39a543f62f25..bd9837c9af97 100644
--- a/arch/mips/generic/board-luton.its.S
+++ b/arch/mips/generic/board-luton.its.S
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
 / {
 	images {
-		fdt@luton_pcb091 {
+		fdt-luton_pcb091 {
 			description = "MSCC Luton PCB091 Device Tree";
 			data = /incbin/("boot/dts/mscc/luton_pcb091.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
@@ -16,8 +16,8 @@
 	configurations {
 		pcb091 {
 			description = "Luton Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@luton_pcb091";
+			kernel = "kernel";
+			fdt = "fdt-luton_pcb091";
 		};
 	};
 };
diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
index e4cb4f95a8cc..0a2e8f7a8526 100644
--- a/arch/mips/generic/board-ni169445.its.S
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -1,22 +1,22 @@
 / {
 	images {
-		fdt@ni169445 {
+		fdt-ni169445 {
 			description = "NI 169445 device tree";
 			data = /incbin/("boot/dts/ni/169445.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 	};
 
 	configurations {
-		conf@ni169445 {
+		conf-ni169445 {
 			description = "NI 169445 Linux Kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@ni169445";
+			kernel = "kernel";
+			fdt = "fdt-ni169445";
 		};
 	};
 };
diff --git a/arch/mips/generic/board-ocelot.its.S b/arch/mips/generic/board-ocelot.its.S
index 3da23988149a..8c7e3a1b68d3 100644
--- a/arch/mips/generic/board-ocelot.its.S
+++ b/arch/mips/generic/board-ocelot.its.S
@@ -1,40 +1,40 @@
 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
 / {
 	images {
-		fdt@ocelot_pcb123 {
+		fdt-ocelot_pcb123 {
 			description = "MSCC Ocelot PCB123 Device Tree";
 			data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 
-		fdt@ocelot_pcb120 {
+		fdt-ocelot_pcb120 {
 			description = "MSCC Ocelot PCB120 Device Tree";
 			data = /incbin/("boot/dts/mscc/ocelot_pcb120.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 	};
 
 	configurations {
-		conf@ocelot_pcb123 {
+		conf-ocelot_pcb123 {
 			description = "Ocelot Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@ocelot_pcb123";
+			kernel = "kernel";
+			fdt = "fdt-ocelot_pcb123";
 		};
 
-		conf@ocelot_pcb120 {
+		conf-ocelot_pcb120 {
 			description = "Ocelot Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@ocelot_pcb120";
+			kernel = "kernel";
+			fdt = "fdt-ocelot_pcb120";
 		};
 	};
 };
diff --git a/arch/mips/generic/board-serval.its.S b/arch/mips/generic/board-serval.its.S
index 4ea4fc9d757f..dde833efe980 100644
--- a/arch/mips/generic/board-serval.its.S
+++ b/arch/mips/generic/board-serval.its.S
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
 / {
 	images {
-		fdt@serval_pcb105 {
+		fdt-serval_pcb105 {
 			description = "MSCC Serval PCB105 Device Tree";
 			data = /incbin/("boot/dts/mscc/serval_pcb105.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
@@ -16,8 +16,8 @@
 	configurations {
 		pcb105 {
 			description = "Serval Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@serval_pcb105";
+			kernel = "kernel";
+			fdt = "fdt-serval_pcb105";
 			ramdisk = "ramdisk";
 		};
 	};
diff --git a/arch/mips/generic/board-xilfpga.its.S b/arch/mips/generic/board-xilfpga.its.S
index a2e773d3f14f..08c1e900eb4e 100644
--- a/arch/mips/generic/board-xilfpga.its.S
+++ b/arch/mips/generic/board-xilfpga.its.S
@@ -1,22 +1,22 @@
 / {
 	images {
-		fdt@xilfpga {
+		fdt-xilfpga {
 			description = "MIPSfpga (xilfpga) Device Tree";
 			data = /incbin/("boot/dts/xilfpga/nexys4ddr.dtb");
 			type = "flat_dt";
 			arch = "mips";
 			compression = "none";
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 	};
 
 	configurations {
-		conf@xilfpga {
+		conf-xilfpga {
 			description = "MIPSfpga Linux kernel";
-			kernel = "kernel@0";
-			fdt = "fdt@xilfpga";
+			kernel = "kernel";
+			fdt = "fdt-xilfpga";
 		};
 	};
 };
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index 1a08438fd893..3e254676540f 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -6,7 +6,7 @@
 	#address-cells = <ADDR_CELLS>;
 
 	images {
-		kernel@0 {
+		kernel {
 			description = KERNEL_NAME;
 			data = /incbin/(VMLINUX_BINARY);
 			type = "kernel";
@@ -15,18 +15,18 @@
 			compression = VMLINUX_COMPRESSION;
 			load = /bits/ ADDR_BITS <VMLINUX_LOAD_ADDRESS>;
 			entry = /bits/ ADDR_BITS <VMLINUX_ENTRY_ADDRESS>;
-			hash@0 {
+			hash {
 				algo = "sha1";
 			};
 		};
 	};
 
 	configurations {
-		default = "conf@default";
+		default = "conf-default";
 
-		conf@default {
+		conf-default {
 			description = "Generic Linux kernel";
-			kernel = "kernel@0";
+			kernel = "kernel";
 		};
 	};
 };

base-commit: e86e75596623e1ce5d784db8214687326712a8ae
-- 
2.31.1.189.g2e36527f23


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] MIPS: generic: Update node names to avoid unit addresses
  2021-04-09 19:21     ` [PATCH] MIPS: generic: Update node names to avoid unit addresses Nathan Chancellor
@ 2021-04-09 19:41       ` Tom Rini
  2021-04-12 15:05       ` Thomas Bogendoerfer
  1 sibling, 0 replies; 9+ messages in thread
From: Tom Rini @ 2021-04-09 19:41 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Paul Burton, Thomas Bogendoerfer, Simon Glass, linux-mips,
	linux-kernel, stable

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

On Fri, Apr 09, 2021 at 12:21:28PM -0700, Nathan Chancellor wrote:

> With the latest mkimage from U-Boot 2021.04, the generic defconfigs no
> longer build, failing with:
> 
> /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> 
> This is expected after the linked U-Boot commits because '@' is
> forbidden in the node names due to the way that libfdt treats nodes with
> the same prefix but different unit addresses.
> 
> Switch the '@' in the node name to '-'. Drop the unit addresses from the
> hash and kernel child nodes because there is only one node so they do
> not need to have a number to differentiate them.
> 
> Cc: stable@vger.kernel.org
> Link: https://source.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4
> Link: https://source.denx.de/u-boot/u-boot/-/commit/3f04db891a353f4b127ed57279279f851c6b4917
> Suggested-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] MIPS: generic: Update node names to avoid unit addresses
  2021-04-09 19:21     ` [PATCH] MIPS: generic: Update node names to avoid unit addresses Nathan Chancellor
  2021-04-09 19:41       ` Tom Rini
@ 2021-04-12 15:05       ` Thomas Bogendoerfer
  1 sibling, 0 replies; 9+ messages in thread
From: Thomas Bogendoerfer @ 2021-04-12 15:05 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Paul Burton, Tom Rini, Simon Glass, linux-mips, linux-kernel, stable

On Fri, Apr 09, 2021 at 12:21:28PM -0700, Nathan Chancellor wrote:
> With the latest mkimage from U-Boot 2021.04, the generic defconfigs no
> longer build, failing with:
> 
> /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1
> 
> This is expected after the linked U-Boot commits because '@' is
> forbidden in the node names due to the way that libfdt treats nodes with
> the same prefix but different unit addresses.
> 
> Switch the '@' in the node name to '-'. Drop the unit addresses from the
> hash and kernel child nodes because there is only one node so they do
> not need to have a number to differentiate them.
> 
> Cc: stable@vger.kernel.org
> Link: https://source.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4
> Link: https://source.denx.de/u-boot/u-boot/-/commit/3f04db891a353f4b127ed57279279f851c6b4917
> Suggested-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
>  arch/mips/generic/board-boston.its.S   | 10 +++++-----
>  arch/mips/generic/board-jaguar2.its.S  | 16 ++++++++--------
>  arch/mips/generic/board-luton.its.S    |  8 ++++----
>  arch/mips/generic/board-ni169445.its.S | 10 +++++-----
>  arch/mips/generic/board-ocelot.its.S   | 20 ++++++++++----------
>  arch/mips/generic/board-serval.its.S   |  8 ++++----
>  arch/mips/generic/board-xilfpga.its.S  | 10 +++++-----
>  arch/mips/generic/vmlinux.its.S        | 10 +++++-----
>  8 files changed, 46 insertions(+), 46 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-04-12 15:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 18:22 mkimage regression when building ARCH=mips defconfig Linux kernel Nathan Chancellor
2021-04-08 18:22 ` Nathan Chancellor
2021-04-08 23:55 ` Simon Glass
2021-04-08 23:55   ` Simon Glass
2021-04-09 17:47   ` Tom Rini
2021-04-09 17:47     ` Tom Rini
2021-04-09 19:21     ` [PATCH] MIPS: generic: Update node names to avoid unit addresses Nathan Chancellor
2021-04-09 19:41       ` Tom Rini
2021-04-12 15:05       ` Thomas Bogendoerfer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.