Skip to contentSkip to conversation

MODSIGN: Fix including certificate twice when the signing_key.x509 already exists

PATCH Superseded Chun-Yi Lee 1 participant 1 message Feb 22, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 MODSIGN: Fix including certificate twice when the signing_key.x509 already exists

This issue was found in devel-pekey branch on linux-modsign.git tree. The x509_certificate_list includes certificate twice when the signing_key.x509 already exists.
We can reproduce this issue by making kernel twice, the build log of second time looks like this:

...
CHK kernel/config_data.h
CERTS kernel/x509_certificate_list
- Including cert /ramdisk/working/joey/linux-modsign/signing_key.x509
- Including cert signing_key.x509
...

Actually the build path was the same with the srctree path when building kernel. It causes the size of bzImage increased by packaging certificates twice.

v2:
Using '$(shell /bin/pwd)' instead of '$(shell pwd)' for more reliable between different shells.

Cc Rusty Russell <[email protected]>
Cc Josh Boyer <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Michal Marek <[email protected]>
---
 kernel/Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
kernel/Makefile +4 -1
index 0ca8c0a..3b854ce 100644
@@ -142,7 +142,10 @@ $(obj)/timeconst.h: $(src)/timeconst.pl FORCE
 #
 ###############################################################################
 ifeq ($(CONFIG_SYSTEM_TRUSTED_KEYRING),y)
-X509_CERTIFICATES-y := $(wildcard *.x509) $(wildcard $(srctree)/*.x509)
+X509_CERTIFICATES-y := $(wildcard *.x509)
+ifneq ($(shell /bin/pwd), $(srctree))
+X509_CERTIFICATES-y += $(wildcard $(srctree)/*.x509)
+endif
 X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += signing_key.x509
 X509_CERTIFICATES := $(sort $(X509_CERTIFICATES-y))
 
Signature · 1 line
1.6.0.2