Skip to contentSkip to conversation

fixdep: fix U-Boot own code to handle only valid symbol characters

PATCH New Masahiro Yamada 2 participants 5 messages Feb 18, 2020 – Mar 17, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fixdep: fix U-Boot own code to handle only valid symbol characters

Currently, fixdep skips parsing include/linux/kconfig.h, but if it parsed it, it would translate the following code in kconfig.h

config_enabled(CONFIG_VAL(option##_MODULE)

into:

  $(wildcard include/config/option##/module.h)

When Kbuild includes .*.cmd, it would emit the following error:

*** unterminated call to function 'wildcard': missing ')'. Stop.

This issue prevents us from importing the upstream Linux commit 638e69cf2230 ("fixdep: do not ignore kconfig.h").

Fix this by handling only alphanumerical characters and underscores. This makes sense because they match to the valid character sets in Kconfig symbols.

As a side-note, you can reproduce this issue only on GNU Make <= 4.2.1

For GNU Make <= 4.2.1, the '#' always means the start of a comment. Hence, GNU Make thinks the closing ')' is missing.

The following commit in GNU Make changed how it handles '#' in function invocations. So, this does not happen for GNU Make 4.3

| commit c6966b323811c37acedff05b576b907b06aea5f4
| Author: Paul Smith <[email protected]>
| Date:   Thu Dec 22 18:47:26 2016 -0500
|
|    [SV 20513] Un-escaped # are not comments in function invocations

---

This patch is applicable to the current upstream code.

 scripts/basic/fixdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/basic/fixdep.c +1 -1
index da7fb2cd4dde..6a668f114096 100644
@@ -262,7 +262,7 @@ static void parse_config_file(const char *map, size_t len)
 		    (q - p == 3 && !memcmp(p, "VAL(", 4))) {
 			p = q + 1;
 			for (q = p; q < map + len; q++)
-				if (*q == ')')
+				if (!(isalnum(*q) || *q == '_'))
 					goto found2;
 			continue;
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 fixdep: fix U-Boot own code to handle only valid symbol characters

Quoted 29 lines · Masahiro Yamada

Currently, fixdep skips parsing include/linux/kconfig.h, but if it parsed it, it would translate the following code in kconfig.h

config_enabled(CONFIG_VAL(option##_MODULE)

into:

  $(wildcard include/config/option##/module.h)

When Kbuild includes .*.cmd, it would emit the following error:

*** unterminated call to function 'wildcard': missing ')'. Stop.

This issue prevents us from importing the upstream Linux commit 638e69cf2230 ("fixdep: do not ignore kconfig.h").

Fix this by handling only alphanumerical characters and underscores. This makes sense because they match to the valid character sets in Kconfig symbols.

As a side-note, you can reproduce this issue only on GNU Make <= 4.2.1

For GNU Make <= 4.2.1, the '#' always means the start of a comment. Hence, GNU Make thinks the closing ')' is missing.

The following commit in GNU Make changed how it handles '#' in function invocations. So, this does not happen for GNU Make 4.3

Quoted 8 lines
| commit c6966b323811c37acedff05b576b907b06aea5f4
| Author: Paul Smith <[email protected]>
| Date:   Thu Dec 22 18:47:26 2016 -0500
|
|    [SV 20513] Un-escaped # are not comments in function invocations

---

Maybe, this can have this tag.

Fixes 8be60f06c258 ("linux/kconfig.h: add CPP macros useful for

per-image config options")

Quoted 22 lines

This patch is applicable to the current upstream code.

 scripts/basic/fixdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/basic/fixdep.c +1 -2
index da7fb2cd4dde..6a668f114096 100644
@@ -262,7 +262,7 @@ static void parse_config_file(const char *map, size_t len)
                    (q - p == 3 && !memcmp(p, "VAL(", 4))) {
                        p = q + 1;
                        for (q = p; q < map + len; q++)
-                               if (*q == ')')
+                               if (!(isalnum(*q) || *q == '_'))
                                        goto found2;
                        continue;
 
--

2.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw

PATCH 1/1 fixdep: fix U-Boot own code to handle only valid symbol characters

Quoted 36 lines · Masahiro Yamada
Quoted 35 lines · Masahiro Yamada

Currently, fixdep skips parsing include/linux/kconfig.h, but if it parsed it, it would translate the following code in kconfig.h

config_enabled(CONFIG_VAL(option##_MODULE)

into:

  $(wildcard include/config/option##/module.h)

When Kbuild includes .*.cmd, it would emit the following error:

*** unterminated call to function 'wildcard': missing ')'. Stop.

This issue prevents us from importing the upstream Linux commit 638e69cf2230 ("fixdep: do not ignore kconfig.h").

Fix this by handling only alphanumerical characters and underscores. This makes sense because they match to the valid character sets in Kconfig symbols.

As a side-note, you can reproduce this issue only on GNU Make <= 4.2.1

For GNU Make <= 4.2.1, the '#' always means the start of a comment. Hence, GNU Make thinks the closing ')' is missing.

The following commit in GNU Make changed how it handles '#' in function invocations. So, this does not happen for GNU Make 4.3

| commit c6966b323811c37acedff05b576b907b06aea5f4
| Author: Paul Smith <[email protected]>
| Date:   Thu Dec 22 18:47:26 2016 -0500
|
|    [SV 20513] Un-escaped # are not comments in function invocations
Quoted 8 lines
Quoted 2 lines

---

Maybe, this can have this tag.

Fixes 8be60f06c258 ("linux/kconfig.h: add CPP macros useful for

per-image config options")

Ah, OK, thanks. Yes, I'll go this route to keep bisectability and fully re-sync the program.

Signature · 8 lines
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/20200218/8aae374a/attachment.sig>
#3 lore raw

PATCH 1/1 fixdep: fix U-Boot own code to handle only valid symbol characters

In reply to Masahiro Yamada
Quoted 35 lines · Masahiro Yamada

Currently, fixdep skips parsing include/linux/kconfig.h, but if it parsed it, it would translate the following code in kconfig.h

config_enabled(CONFIG_VAL(option##_MODULE)

into:

  $(wildcard include/config/option##/module.h)

When Kbuild includes .*.cmd, it would emit the following error:

*** unterminated call to function 'wildcard': missing ')'. Stop.

This issue prevents us from importing the upstream Linux commit 638e69cf2230 ("fixdep: do not ignore kconfig.h").

Fix this by handling only alphanumerical characters and underscores. This makes sense because they match to the valid character sets in Kconfig symbols.

As a side-note, you can reproduce this issue only on GNU Make <= 4.2.1

For GNU Make <= 4.2.1, the '#' always means the start of a comment. Hence, GNU Make thinks the closing ')' is missing.

The following commit in GNU Make changed how it handles '#' in function invocations. So, this does not happen for GNU Make 4.3

| commit c6966b323811c37acedff05b576b907b06aea5f4
| Author: Paul Smith <[email protected]>
| Date:   Thu Dec 22 18:47:26 2016 -0500
|
|    [SV 20513] Un-escaped # are not comments in function invocations
Quoted 4 lines

---

This patch is applicable to the current upstream code.

One more tag:

Signature · 2 lines
Best Regards
Masahiro Yamada
#4 lore raw

PATCH 1/1 fixdep: fix U-Boot own code to handle only valid symbol characters

In reply to Masahiro Yamada
Quoted 28 lines · Masahiro Yamada

Currently, fixdep skips parsing include/linux/kconfig.h, but if it parsed it, it would translate the following code in kconfig.h

config_enabled(CONFIG_VAL(option##_MODULE)

into:

  $(wildcard include/config/option##/module.h)

When Kbuild includes .*.cmd, it would emit the following error:

*** unterminated call to function 'wildcard': missing ')'. Stop.

This issue prevents us from importing the upstream Linux commit 638e69cf2230 ("fixdep: do not ignore kconfig.h").

Fix this by handling only alphanumerical characters and underscores. This makes sense because they match to the valid character sets in Kconfig symbols.

As a side-note, you can reproduce this issue only on GNU Make <= 4.2.1

For GNU Make <= 4.2.1, the '#' always means the start of a comment. Hence, GNU Make thinks the closing ')' is missing.

The following commit in GNU Make changed how it handles '#' in function invocations. So, this does not happen for GNU Make 4.3

Quoted 8 lines
| commit c6966b323811c37acedff05b576b907b06aea5f4
| Author: Paul Smith <[email protected]>
| Date:   Thu Dec 22 18:47:26 2016 -0500
|
|    [SV 20513] Un-escaped # are not comments in function invocations

Applied to u-boot/next, thanks!

Signature · 8 lines
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/20200317/df563ddc/attachment.sig>