[OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

Change to use '-' rather than '@' as separators.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
 meta/classes/kernel-fitimage.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 5cfd8af99d..4858037706 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -217,13 +217,13 @@ fitimage_emit_section_boot_script() {
 	bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}"
 
         cat << EOF >> ${1}
-                bootscr@${2} {
+                bootscr-${2} {
                         description = "U-boot script";
                         data = /incbin/("${3}");
                         type = "script";
                         arch = "${UBOOT_ARCH}";
                         compression = "none";
-                        hash@1 {
+                        hash-1 {
                                 algo = "${bootscr_csum}";
                         };
                 };
@@ -232,7 +232,7 @@ EOF
 	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then
 		sed -i '$ d' ${1}
 		cat << EOF >> ${1}
-                        signature@1 {
+                        signature-1 {
                                 algo = "${bootscr_csum},${bootscr_sign_algo}";
                                 key-name-hint = "${bootscr_sign_keyname}";
                         };
@@ -383,7 +383,7 @@ fitimage_emit_section_config() {
 	if [ -n "${bootscr_id}" ]; then
 		conf_desc="${conf_desc}${sep}u-boot script"
 		sep=", "
-		bootscr_line="bootscr = \"bootscr@${bootscr_id}\";"
+		bootscr_line="bootscr = \"bootscr-${bootscr_id}\";"
 	fi
 
 	if [ -n "${config_id}" ]; then
-- 
2.29.0

Re: [OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[Richard Purdie]

On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
> From: Ming Liu <liu.ming50@gmail.com>
> 
> Change to use '-' rather than '@' as separators.

Why? The commit message needs more information.

Cheers,

Richard

Re: [OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[Bruce Ashfield]

On Fri, May 21, 2021 at 10:28 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
> > From: Ming Liu <liu.ming50@gmail.com>
> >
> > Change to use '-' rather than '@' as separators.
>
> Why? The commit message needs more information.
>

I had exactly the same question/comment!

Bruce

> Cheers,
>
> Richard
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[Andrey Zhizhikin]

On Fri, May 21, 2021 at 4:44 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Fri, May 21, 2021 at 10:28 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
> > > From: Ming Liu <liu.ming50@gmail.com>
> > >
> > > Change to use '-' rather than '@' as separators.
> >
> > Why? The commit message needs more information.
> >
>
> I had exactly the same question/comment!

I guess this comes from the attempt to fix CVE-2021-27138, which was
already addressed in U-Boot with commit 3f04db891a35 ("image: Check
for unit addresses in FITs").

`@` is prohibied, so the `-` should be used instead.

I believe it would throw the build error, somethign like this:
| ./tools/mkimage: verify_header failed for FIT Image support with exit
| code 1

I do agree though - commit message should state this reason for this change.

>
> Bruce
>
> > Cheers,
> >
> > Richard
> >
> >
> >
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
> 
>


-- 
Regards,
Andrey.

Re: [OE-core] [PATCH] kernel-fitimage.bbclass: fix wrong separators

[Ming Liu]

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

Hi, Andrey:

Thanks, exactly as you explained, it's to fix CVE-2021-27138, will add more
commit messages.

//Ming Liu

Andrey Zhizhikin <andrey.z@gmail.com> 於 2021年5月21日 週五 下午6:04寫道：

> On Fri, May 21, 2021 at 4:44 PM Bruce Ashfield <bruce.ashfield@gmail.com>
> wrote:
> >
> > On Fri, May 21, 2021 at 10:28 AM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
> > > > From: Ming Liu <liu.ming50@gmail.com>
> > > >
> > > > Change to use '-' rather than '@' as separators.
> > >
> > > Why? The commit message needs more information.
> > >
> >
> > I had exactly the same question/comment!
>
> I guess this comes from the attempt to fix CVE-2021-27138, which was
> already addressed in U-Boot with commit 3f04db891a35 ("image: Check
> for unit addresses in FITs").
>
> `@` is prohibied, so the `-` should be used instead.
>
> I believe it would throw the build error, somethign like this:
> | ./tools/mkimage: verify_header failed for FIT Image support with exit
> | code 1
>
> I do agree though - commit message should state this reason for this
> change.
>
> >
> > Bruce
> >
> > > Cheers,
> > >
> > > Richard
> > >
> > >
> > >
> > >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
> >
> > 
> >
>
>
> --
> Regards,
> Andrey.
>

[-- Attachment #2: Type: text/html, Size: 2318 bytes --]