Skip to contentSkip to conversation

MODSIGN: Fix including certificate twice when the signing_key.x509

PATCH In review Lee, Chun-Yi 5 participants 7 messages Jan 9, 2014 – Jan 17, 2014

lore
Share & tools
lore
#0 lore raw

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

From: Chun-Yi Lee <[email protected]>

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 bc010ee..582fa7a 100644
@@ -136,7 +136,10 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc 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) += $(objtree)/signing_key.x509
 X509_CERTIFICATES-raw := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \
 				$(or $(realpath $(CERT)),$(CERT))))
Signature · 1 line
1.6.4.2
#1 lore raw

Punting to David Howells...

Cheers,
Rusty.

Quoted 17 lines · Chun-Yi

From: Chun-Yi Lee <[email protected]>

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
...

Quoted 8 lines

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

Hmm, that's not a great test for equality. How about:

     ifneq ($(realpath .), $(realpath $(srctree)))

That should cover all the cases.

Cheers,
Rusty.

Quoted 31 lines
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 bc010ee..582fa7a 100644
@@ -136,7 +136,10 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc 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) += $(objtree)/signing_key.x509
 X509_CERTIFICATES-raw := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \
 				$(or $(realpath $(CERT)),$(CERT))))
Signature · 1 line
1.6.4.2
#2 lore raw

於 三,2014-01-15 於 15:09 +1030,Rusty Russell 提到:

Quoted 6 lines
Quoted 3 lines

v2:
Using '$(shell /bin/pwd)' instead of '$(shell pwd)' for more

reliable

Quoted 1 line

between different shells

Quoted 8 lines

Hmm, that's not a great test for equality. How about:

     ifneq ($(realpath .), $(realpath $(srctree)))

That should cover all the cases.

Cheers,
Rusty.

Yes, it's better!

Thanks for your suggestion, I will send new version with changelog updated.

Joey Lee

#3 lore raw
In reply to Rusty Russell
Quoted 11 lines · Rusty Russell
Quoted 4 lines · Chun-Yi

From: Chun-Yi Lee <[email protected]>
v2:
Using '$(shell /bin/pwd)' instead of '$(shell pwd)' for more reliable between different shells

Hmm, that's not a great test for equality. How about:

     ifneq ($(realpath .), $(realpath $(srctree)))

That should cover all the cases.

make 3.80 does not have realpath :(.

Michal

#4 lore raw
Quoted 7 lines · Michal Marek
Quoted 6 lines · Rusty Russell
Quoted 4 lines · Chun-Yi

From: Chun-Yi Lee <[email protected]>
v2:
Using '$(shell /bin/pwd)' instead of '$(shell pwd)' for more reliable between different shells

Quoted 7 lines
Quoted 5 lines

Hmm, that's not a great test for equality. How about:

     ifneq ($(realpath .), $(realpath $(srctree)))

That should cover all the cases.

make 3.80 does not have realpath :(.

OK, I guess the former is the best compromise then.

Thanks,
Rusty.

#5 lore raw
In reply to Lee, Chun-Yi
Quoted 2 lines · Chun-Yi

This issue was found in devel-pekey branch on linux-modsign.git tree. The

Are you asking for this to go upstream or into my devel-pekey branch?

If upstream you want it to go upstream, I presume commit d7ec435fdd03cfee70dba934ee384acc87bd6d00 doesn't fix the problem?

David

#6 lore raw

於 四,2014-01-16 於 12:31 +0000,David Howells 提到:

Quoted 7 lines

Are you asking for this to go upstream or into my devel-pekey branch?

If upstream you want it to go upstream, I presume commit d7ec435fdd03cfee70dba934ee384acc87bd6d00 doesn't fix the problem?

David

You are right. I tried the d7ec435 patch fixed issue. Please ignore my patch.

Thanks a lot!
Joey Lee