[PATCH] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

[PATCH] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

[Florian Amstutz]

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

If i or j have not been unset in do_deploy:prepend functions, images are not correctly
copied to DEPLOYDIR.

Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
---
meta/recipes-bsp/u-boot/u-boot.inc | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 54ea2e9e50..70fb192d6e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -209,6 +209,7 @@ RDEPENDS:${PN} += "${PN}-env"
do_deploy () {
if [ -n "${UBOOT_CONFIG}" ]
then
+        unset i j
for config in ${UBOOT_MACHINE}; do
i=$(expr $i + 1);
for type in ${UBOOT_CONFIG}; do
--
2.34.1

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

Patchtest results for [PATCH] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

[patchtest]

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

Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/u-boot-Fix-potential-index-error-issues-in-do_deploy-with-multiple-u-boot-configurations.patch

FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: Parse error Hunk diff line expected: do_deploy () {
SKIP: test Signed-off-by presence: Parse error Hunk diff line expected: do_deploy () {
SKIP: test Upstream-Status presence: Parse error Hunk diff line expected: do_deploy () {
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: Python-unidiff parse error (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!

Re: [OE-core] [PATCH] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

[Quentin Schulz]

Hi Florian,

On 7/2/24 10:16 AM, Florian Amstutz via lists.openembedded.org wrote:
> You don't often get email from florian.amstutz=scs.ch@lists.openembedded.org. Learn why this is important<https://aka.ms/LearnAboutSenderIdentification>
> If i or j have not been unset in do_deploy:prepend functions, images are not correctly
> copied to DEPLOYDIR.
> 
> Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
> ---
>   meta/recipes-bsp/u-boot/u-boot.inc | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 54ea2e9e50..70fb192d6e 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -209,6 +209,7 @@ RDEPENDS:${PN} += "${PN}-env"
>   do_deploy () {
>       if [ -n "${UBOOT_CONFIG}" ]
>       then
> +        unset i j

There are a LOT more of those missing in do_install, do_deploy, etc... 
could you please fix all of them? I imagine that we can also remove the 
`unset` after the for-loops if they are done before the for-loop?

Cheers,
Quentin

Re: [OE-core] [PATCH] u-boot: Fix potential index error issues in do_deploy with multiple u-boot configurations

[Alexandre Belloni]

Hello,

On 02/07/2024 01:16:35-0700, Florian Amstutz wrote:
> If i or j have not been unset in do_deploy:prepend functions, images are not correctly
> copied to DEPLOYDIR.
> 
> Signed-off-by: Florian Amstutz <florian.amstutz@scs.ch>
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 54ea2e9e50..70fb192d6e 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -209,6 +209,7 @@ RDEPENDS:${PN} += "${PN}-env"
> do_deploy () {

Whitespaces are missing in your patch, so it doesn't apply (this line
should begin with a space).

> if [ -n "${UBOOT_CONFIG}" ]
> then
> + � � � �unset i j


I feel this should be fixed in your do_deploy:prepend or we are going to
end up with thousands of patches unsetting variables that are not set
just in case a :prepend sets them.

> for config in ${UBOOT_MACHINE}; do
> i=$(expr $i + 1);
> for type in ${UBOOT_CONFIG}; do
> --
> 2.34.1

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#201415): https://lists.openembedded.org/g/openembedded-core/message/201415
> Mute This Topic: https://lists.openembedded.org/mt/106996344/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com