certs/blacklist_hashes.c: fix const confusion in certs blacklist
Subsystems (3)
PATCH 1/4 certs/blacklist_hashes.c: fix const confusion in certs blacklist
This file fails to compile as follows:
CC certs/blacklist_hashes.ocerts/blacklist_hashes.c:4:1: error: ignoring attribute ‘section (".init.data")’ because it conflicts with previous ‘section (".init.rodata")’ [-Werror=attributes]
4 | const char __initdata *const blacklist_hashes[] = {
| ^~~~~
In file included from certs/blacklist_hashes.c:2:
certs/blacklist.h:5:38: note: previous declaration here
5 | extern const char __initconst *const blacklist_hashes[];
| ^~~~~~~~~~~~~~~~Apply the same fix as commit 2be04df5668d ("certs/blacklist_nohashes.c:
fix const confusion in certs blacklist").
---
certs/blacklist_hashes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
certs/blacklist_hashes.c +1 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" -const char __initdata *const blacklist_hashes[] = { +const char __initconst *const blacklist_hashes[] = { #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST ,NULL };
Signature · 1 line
2.32.0
PATCH 2/4 certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Commit addf466389d9 ("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.
In the meantime, the base code had been removed by commit b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove config_filename macro").
Fix the Makefile.
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from certs/blacklist_hashes.c and also works as a timestamp.
Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)
certs/.gitignore +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_list
certs/Makefile +10 -10
@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@
@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does not
certs/blacklist_hashes.c +1 -1
@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };
Signature · 1 line
2.32.0
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 9 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.
Quoted 8 lines
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>
As a side note, it may let an orphan certs/blacklist_hashes_checked file but we can't really do something about that and it's OK.
Thanks!
Quoted 75 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 19 lines · Mickaël Salaün
Quoted 15 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Quoted 7 lines
Quoted 2 lines
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.
GNU Make uses timestamps of files for dependency tracking, so Kbuild keeps all intermediate files.
Keeping certs/blacklist_hashes_checked
is the right thing to do.
Quoted 72 lines
Thanks!
Quoted 70 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-0@@ -2,6 +2,6 @@#include "blacklist.h"
Quoted 5 lines
certs/blacklist_hashes.c line 7
Quoted 5 lines
certs/blacklist_hashes.c +1
-1const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };
--
Best Regards
Masahiro Yamada
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 29 lines · Masahiro Yamada
Quoted 19 lines · Mickaël Salaün
Quoted 15 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Quoted 7 lines
Quoted 2 lines
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.
Quoted 5 lines
GNU Make uses timestamps of files for dependency tracking, so
Kbuildkeeps all intermediate files.Keeping
certs/blacklist_hashes_checked
is the right thing to do.
blacklist_hashes_checked is the file you replaced with blacklist_hash_list, and is then not used in any Makefile anymore. There is then no timestamp issue. I just wanted to mention that it is normal that a git status will show it on build directories also used as source directories that were already using such feature.
Quoted 86 lines
Quoted 75 lines
Thanks!
Quoted 70 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-0@@ -2,6 +2,6 @@#include "blacklist.h" Quoted 5 lines
certs/blacklist_hashes.c line 7
Quoted 5 lines
certs/blacklist_hashes.c +1
-1const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };--
Best Regards
Masahiro Yamada
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 35 lines · Mickaël Salaün
Quoted 32 lines · Masahiro Yamada
Quoted 19 lines · Mickaël Salaün
Quoted 15 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Quoted 7 lines
Quoted 2 lines
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.GNU Make uses timestamps of files for dependency tracking, so
Kbuildkeeps all intermediate files.
Quoted 8 lines
Quoted 2 lines
Keeping
certs/blacklist_hashes_checked
is the right thing to do.
blacklist_hashes_checkedis the file you replaced withblacklist_hash_list, and is then not used in anyMakefileanymore. There is then no timestamp issue. I just wanted to mention that it is normal that a git status will show it on build directories also used as source directories that were already using such feature.
Ah, sorry, I misunderstood your feedback.
If 'git status' is your concern,
we can add certs/blacklist_hashes_checked to scripts/remove-stale-files.
addf466389d9d78f255e8b15ac44ab4791029852 was merged into mainline just recently, and not contained in any release.
But, if the orphan timestamp matters, I will do it. It is just a one-liner addition.
--
Best Regards
Masahiro Yamada
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 48 lines · Masahiro Yamada
Quoted 35 lines · Mickaël Salaün
Quoted 32 lines · Masahiro Yamada
Quoted 19 lines · Mickaël Salaün
Quoted 15 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Quoted 7 lines
Quoted 2 lines
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.GNU Make uses timestamps of files for dependency tracking, so
Kbuildkeeps all intermediate files.Quoted 8 lines
Quoted 2 lines
Keeping
certs/blacklist_hashes_checked
is the right thing to do.
blacklist_hashes_checkedis the file you replaced withblacklist_hash_list, and is then not used in anyMakefileanymore. There is then no timestamp issue. I just wanted to mention that it is normal that a git status will show it on build directories also used as source directories that were already using such feature.Ah, sorry, I misunderstood your feedback.
Quoted 7 lines
If 'git status' is your concern,
we can addcerts/blacklist_hashes_checkedtoscripts/remove-stale-files.
addf466389d9d78f255e8b15ac44ab4791029852was merged into mainline just recently, and not contained in any release.
Indeed, it's all good then.
Quoted 3 lines
But, if the orphan timestamp matters, I will do it. It is just a one-liner addition.
Jarkko Sakkinen
maintainerRe: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
In reply to Mickaël SalaünQuoted 88 lines · Mickaël Salaün
Quoted 9 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Quoted 8 lines
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.Thanks!
Quoted 60 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-1--- a/certs/blacklist_hashes.c
Quoted 8 lines
certs/blacklist_hashes.c line 6
Quoted 8 lines
+++
b/certs/blacklist_hashes.ccerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };
I'll make a PR for 1/4 and 2/4 so that they get into 5.19.
BR, Jarkko
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 101 lines · Jarkko Sakkinen
Quoted 88 lines · Mickaël Salaün
Quoted 9 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Quoted 8 lines
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.Thanks!
Quoted 60 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-1--- a/certs/blacklist_hashes.cQuoted 8 lines
certs/blacklist_hashes.c line 6
Quoted 8 lines
+++
b/certs/blacklist_hashes.ccerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };I'll make a PR for 1/4 and 2/4 so that they get into 5.19.
Quoted 1 line
BR, Jarkko
Thank you!
What shall we do for 3/4 and 4/4?
Do you have a plan to queue them up for the next MW?
Or, shall I apply them to my kbuild tree with your reivewed-by?
Signature · 2 lines
Best Regards Masahiro Yamada
Jarkko Sakkinen
maintainerRe: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 105 lines · Masahiro Yamada
Quoted 101 lines · Jarkko Sakkinen
Quoted 88 lines · Mickaël Salaün
Quoted 9 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Quoted 8 lines
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.Thanks!
Quoted 60 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-1--- a/certs/blacklist_hashes.cQuoted 8 lines
certs/blacklist_hashes.c line 6
Quoted 8 lines
+++
b/certs/blacklist_hashes.ccerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };I'll make a PR for 1/4 and 2/4 so that they get into 5.19.
Quoted 1 line
BR, Jarkko
Quoted 7 lines
Thank you!
What shall we do for 3/4 and 4/4?
Do you have a plan to queue them up for the next MW?
Or, shall I apply them to my kbuild tree with your reivewed-by?
If possible, please do, thank you for taking the trouble.
BR, Jarkko
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
Quoted 111 lines · Jarkko Sakkinen
Quoted 109 lines · Masahiro Yamada
Quoted 101 lines · Jarkko Sakkinen
Quoted 88 lines · Mickaël Salaün
Quoted 9 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Quoted 8 lines
Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Mickaël Salaün <[email protected]>As a side note, it may let an orphan
certs/blacklist_hashes_checkedfile but we can't really do something about that and it's OK.Thanks!
Quoted 60 lines
---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +0
-1--- a/certs/blacklist_hashes.cQuoted 8 lines
certs/blacklist_hashes.c line 6
Quoted 8 lines
+++
b/certs/blacklist_hashes.ccerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };I'll make a PR for 1/4 and 2/4 so that they get into 5.19.
Quoted 1 line
BR, Jarkko
Thank you!
What shall we do for 3/4 and 4/4?
Quoted 7 lines
Quoted 3 lines
Do you have a plan to queue them up for the next MW?
Or, shall I apply them to my kbuild tree with your reivewed-by?
If possible, please do, thank you for taking the trouble.
BR, Jarkko
Now, 3/4 and 4/4 applied to linux-kbuild.
Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 2/4] certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build
In reply to Masahiro YamadaQuoted 95 lines · Masahiro Yamada
Commit
addf466389d9("certs: Check that builtin blacklist hashes are valid") was applied 8 months after the submission.In the meantime, the base code had been removed by commit
b8c96a6b466c("certs: simplify $(srctree)/ handling and removeconfig_filenamemacro").Fix the
Makefile.Create a local copy of $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST). It is included from
certs/blacklist_hashes.cand also works as a timestamp.Send error messages from check-blacklist-hashes.awk to stderr instead of stdout.
Fixes addf466389d9 ("certs: Check that builtin blacklist hashes are valid")Signed-off-by Masahiro Yamada <[email protected]>---
certs/.gitignore | 2 +- certs/Makefile | 20 ++++++++++---------- certs/blacklist_hashes.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)certs/.gitignore +1
-1@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -/blacklist_hashes_checked +/blacklist_hash_list /extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +10
-10@@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) -quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) - cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ -$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list +CFLAGS_blacklist_hashes.o := -I $(obj) -$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ + cmd_check_and_copy_blacklist_hash_list = \ + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ -CFLAGS_blacklist_hashes.o += -I$(srctree) - -targets += blacklist_hashes_checked -$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE + $(call if_changed,check_and_copy_blacklist_hash_list) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o else obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif +targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@ cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE $(call if_changed,extract_certs) -targets += x509_certificate_list blacklist_hashes_checked +targets += x509_certificate_list # If module signing is requested, say by allyesconfig, but a key has not been # supplied, then one will need to be generated to make sure the build does notcerts/blacklist_hashes.c +1
-1@@ -2,6 +2,6 @@#include "blacklist.h" const char __initconst *const blacklist_hashes[] = { -#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST +#include "blacklist_hash_list" ,NULL };Signature · 1 line
2.32.0
BR, Jarkko
PATCH 3/4 certs: move scripts/check-blacklist-hashes.awk to certs/
In reply to Masahiro YamadaThis script is only used in certs/Makefile, so certs/ is a better home for it.
---
MAINTAINERS | 1 -
certs/Makefile | 2 +-
{scripts => certs}/check-blacklist-hashes.awk | 0
3 files changed, 1 insertion(+), 2 deletions(-)
rename {scripts => certs}/check-blacklist-hashes.awk (100%)MAINTAINERS +0 -1
@@ -4627,7 +4627,6 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk F: scripts/sign-file.c F: tools/certs/
certs/Makefile +1 -1
@@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE
certs/check-blacklist-hashes.awk renamed from scripts/check-blacklist-hashes.awk +0 -0
Signature · 1 line
2.32.0
Re: [PATCH 3/4] certs: move scripts/check-blacklist-hashes.awk to certs/
certs/check-blacklist-hashes.awk
Quoted 40 lines · Masahiro Yamada
This script is only used in
certs/Makefile, socerts/is a better home for it.Signed-off-by Masahiro Yamada <[email protected]>---
MAINTAINERS | 1 - certs/Makefile | 2 +- {scripts => certs}/check-blacklist-hashes.awk | 0 3 files changed, 1 insertion(+), 2 deletions(-)rename {scripts =>
certs}/check-blacklist-hashes.awk(100%)MAINTAINERS +0
-1@@ -4627,7 +4627,6 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk > F: scripts/sign-file.c F: tools/certs/certs/Makefile +1
-1@@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCEcerts/check-blacklist-hashes.awk renamed from scripts/check-blacklist-hashes.awk +0
-0
It looks more appropriate and consistent to me to keep it in scripts/, close to other cert scripts. Is there some precedent to move such script?
Re: [PATCH 3/4] certs: move scripts/check-blacklist-hashes.awk to certs/
Quoted 39 lines · Mickaël Salaün
Quoted 35 lines · Masahiro Yamada
This script is only used in
certs/Makefile, socerts/is a better home for it.Signed-off-by Masahiro Yamada <[email protected]>---
MAINTAINERS | 1 - certs/Makefile | 2 +- {scripts => certs}/check-blacklist-hashes.awk | 0 3 files changed, 1 insertion(+), 2 deletions(-)rename {scripts =>
certs}/check-blacklist-hashes.awk(100%)MAINTAINERS +0
-1@@ -4627,7 +4627,6 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk > F: scripts/sign-file.c F: tools/certs/certs/Makefile +1
-1@@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@
Quoted 8 lines
certs/check-blacklist-hashes.awk
Quoted 5 lines
certs/Makefile +0
-0$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCEcerts/check-blacklist-hashes.awk renamed from scripts/check-blacklist-hashes.awk +0
-0It looks more appropriate and consistent to me to keep it in
scripts/, close to other cert scripts. Is there some precedent to move such script?
I always did that. For example,
f6f57a46435d7253a52a1a07a58183678ad266a0
78a20a012ecea857e438b1f9e8091acb290bd0f5
28ba53c07638f31b153e3a32672a6124d0ff2a97
4484aa800ac588a1fe2175cd53076c21067f44b4
340a02535ee785c64c62a9c45706597a0139e972
Tools can stay in scripts/ if and only if:
- it is used globally during kernel builds
- it is still needed after the kernel builds. "make clean" removes most of the build artifacts but keeps ones under scripts/.
scripts/insert-sys-cert is apparently unneeded for building the kernel. If the intended use is to manipulate vmlinux later,
that is the legitimate reason to stay in scripts/.
(but even better place might be tools/)
certs/signing_key.pem is needed even after kernel builds. So, it should have been kept under scripts/ instead of certs/.
--
Best Regards
Masahiro Yamada
Mickaël Salaün
Reviewed-byRe: [PATCH 3/4] certs: move scripts/check-blacklist-hashes.awk to certs/
Quoted 59 lines · Masahiro Yamada
Quoted 39 lines · Mickaël Salaün
Quoted 35 lines · Masahiro Yamada
This script is only used in
certs/Makefile, socerts/is a better home for it.Signed-off-by Masahiro Yamada <[email protected]>---
MAINTAINERS | 1 - certs/Makefile | 2 +- {scripts => certs}/check-blacklist-hashes.awk | 0 3 files changed, 1 insertion(+), 2 deletions(-)rename {scripts =>
certs}/check-blacklist-hashes.awk(100%)MAINTAINERS +0
-1@@ -4627,7 +4627,6 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk > F: scripts/sign-file.c F: tools/certs/certs/Makefile +1
-1@@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@Quoted 8 lines
certs/check-blacklist-hashes.awk
Quoted 5 lines
certs/Makefile +0
-0$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCEcerts/check-blacklist-hashes.awk renamed from scripts/check-blacklist-hashes.awk +0
-0It looks more appropriate and consistent to me to keep it in
scripts/, close to other cert scripts. Is there some precedent to move such script?I always did that. For example,
f6f57a46435d7253a52a1a07a58183678ad266a0 78a20a012ecea857e438b1f9e8091acb290bd0f5 28ba53c07638f31b153e3a32672a6124d0ff2a97 4484aa800ac588a1fe2175cd53076c21067f44b4 340a02535ee785c64c62a9c45706597a0139e972
Quoted 8 lines
Tools can stay in
scripts/if and only if:- it is used globally during kernel builds
- it is still needed after the kernel builds. "make clean" removes most of the build artifacts but keeps ones under
scripts/.
OK, it would be nice to have these rules in the documentation (didn't find them).
Quoted 18 lines
scripts/insert-sys-certis apparently unneeded for building the kernel. If the intended use is to manipulate vmlinux later,
that is the legitimate reason to stay inscripts/.
(but even better place might betools/)
certs/signing_key.pemis needed even after kernel builds. So, it should have been kept underscripts/instead ofcerts/.--
Best Regards
Masahiro Yamada
Re: [PATCH 3/4] certs: move scripts/check-blacklist-hashes.awk to certs/
In reply to Masahiro YamadaQuoted 44 lines · Masahiro Yamada
This script is only used in
certs/Makefile, socerts/is a better home for it.Signed-off-by Masahiro Yamada <[email protected]>---
MAINTAINERS | 1 - certs/Makefile | 2 +- {scripts => certs}/check-blacklist-hashes.awk | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename {scripts => certs}/check-blacklist-hashes.awk (100%)MAINTAINERS +0
-1@@ -4627,7 +4627,6 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk F: scripts/sign-file.c F: tools/certs/certs/Makefile +1
-1@@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCEcerts/check-blacklist-hashes.awk renamed from scripts/check-blacklist-hashes.awk +0
-0Signature · 1 line
2.32.0
BR, Jarkko
PATCH 4/4 certs: unify blacklist_hashes.c and blacklist_nohashes.c
In reply to Masahiro YamadaThese two files are very similar. Unify them.
---
certs/Makefile | 12 +++++------- certs/blacklist_hashes.c | 1 - certs/blacklist_nohashes.c | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 certs/blacklist_nohashes.c
certs/Makefile +5 -7
@@ -4,24 +4,22 @@ # obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o blacklist_hashes.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o -ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) $(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ + $(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \ $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ - cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ + { cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \ + echo NULL > $@) $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE $(call if_changed,check_and_copy_blacklist_hash_list) -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o -else -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o -endif + targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@
certs/blacklist_hashes.c +0 -1
@@ -3,5 +3,4 @@const char __initconst *const blacklist_hashes[] = { #include "blacklist_hash_list" - ,NULL };
certs/blacklist_nohashes.c deleted +0 -6
@@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "blacklist.h" - -const char __initconst *const blacklist_hashes[] = { -NULL -};
Signature · 1 line
2.32.0
Re: [PATCH 4/4] certs: unify blacklist_hashes.c and blacklist_nohashes.c
Quoted 3 lines · Masahiro Yamada
These two files are very similar. Unify them.
Signed-off-by Masahiro Yamada <[email protected]>
Quoted 64 lines
---
certs/Makefile | 12 +++++------- certs/blacklist_hashes.c | 1 - certs/blacklist_nohashes.c | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-)delete mode 100644
certs/blacklist_nohashes.ccerts/Makefile +5
-7@@ -4,24 +4,22 @@ # obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o blacklist_hashes.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o -ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) $(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ + $(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \ $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ - cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ + { cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \ + echo NULL > $@) $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE $(call if_changed,check_and_copy_blacklist_hash_list) -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o -else -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o -endif + targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@certs/blacklist_hashes.c +0
-1@@ -3,5 +3,4 @@const char __initconst *const blacklist_hashes[] = { #include "blacklist_hash_list" - ,NULL };certs/blacklist_nohashes.c deleted +0
-6@@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "blacklist.h" - -const char __initconst *const blacklist_hashes[] = { -NULL -};
Re: [PATCH 4/4] certs: unify blacklist_hashes.c and blacklist_nohashes.c
In reply to Masahiro YamadaQuoted 70 lines · Masahiro Yamada
These two files are very similar. Unify them.
Signed-off-by Masahiro Yamada <[email protected]>---
certs/Makefile | 12 +++++------- certs/blacklist_hashes.c | 1 - certs/blacklist_nohashes.c | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 certs/blacklist_nohashes.ccerts/Makefile +5
-7@@ -4,24 +4,22 @@ # obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o blacklist_hashes.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o -ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) $(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ + $(if $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST), \ $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ - cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ + { cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST); echo $(comma) NULL; } > $@, \ + echo NULL > $@) $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE $(call if_changed,check_and_copy_blacklist_hash_list) -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o -else -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o -endif + targets += blacklist_hash_list quiet_cmd_extract_certs = CERT $@certs/blacklist_hashes.c +0
-1@@ -3,5 +3,4 @@const char __initconst *const blacklist_hashes[] = { #include "blacklist_hash_list" - ,NULL };certs/blacklist_nohashes.c deleted +0
-6@@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "blacklist.h" - -const char __initconst *const blacklist_hashes[] = { -NULL -};Signature · 1 line
2.32.0
BR, Jarkko
Quoted 11 lines · Masahiro Yamada
This file fails to compile as follows:
CC
certs/blacklist_hashes.ocerts/blacklist_hashes.c:4:1: error: ignoring attribute ‘section (".init.data")’ because it conflicts with previous ‘section (".init.rodata")’ [-Werror=attributes]4 | const char __initdata *const blacklist_hashes[] = { | ^~~~~ In file included from certs/blacklist_hashes.c:2: certs/blacklist.h:5:38: note: previous declaration here 5 | extern const char __initconst *const blacklist_hashes[]; | ^~~~~~~~~~~~~~~~
Quoted 5 lines
Apply the same fix as commit
2be04df5668d("certs/blacklist_nohashes.c:
fix const confusion in certs blacklist").Fixes 734114f8782f ("KEYS: Add a system blacklist keyring")Signed-off-by Masahiro Yamada <[email protected]>
Quoted 18 lines
---
certs/blacklist_hashes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)certs/blacklist_hashes.c +1
-1@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" -const char __initdata *const blacklist_hashes[] = { +const char __initconst *const blacklist_hashes[] = { #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST ,NULL };
Quoted 37 lines · Masahiro Yamada
This file fails to compile as follows:
CC
certs/blacklist_hashes.ocerts/blacklist_hashes.c:4:1: error: ignoring attribute ‘section (".init.data")’ because it conflicts with previous ‘section (".init.rodata")’ [-Werror=attributes]4 | const char __initdata *const blacklist_hashes[] = { | ^~~~~ In file included from certs/blacklist_hashes.c:2: certs/blacklist.h:5:38: note: previous declaration here 5 | extern const char __initconst *const blacklist_hashes[]; | ^~~~~~~~~~~~~~~~Apply the same fix as commit
2be04df5668d("certs/blacklist_nohashes.c:
fix const confusion in certs blacklist").Fixes 734114f8782f ("KEYS: Add a system blacklist keyring")Signed-off-by Masahiro Yamada <[email protected]>---
certs/blacklist_hashes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)certs/blacklist_hashes.c +1
-1@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "blacklist.h" -const char __initdata *const blacklist_hashes[] = { +const char __initconst *const blacklist_hashes[] = { #include CONFIG_SYSTEM_BLACKLIST_HASH_LIST ,NULL };Signature · 1 line
2.32.0
BR, Jarkko