Messages in this thread | | | From | Rusty Russell <> | Subject | Re: [PATCH] MODSIGN: Fix including certificate twice when the signing_key.x509 | Date | Wed, 15 Jan 2014 15:09:54 +1030 |
| |
Punting to David Howells...
Cheers, Rusty. "Lee, Chun-Yi" <joeyli.kernel@gmail.com> writes: > From: Chun-Yi Lee <jlee@suse.com> > > 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
Hmm, that's not a great test for equality. How about:
ifneq ($(realpath .), $(realpath $(srctree)))
That should cover all the cases.
Cheers, Rusty.
> > Cc: Rusty Russell <rusty@rustcorp.com.au> > Cc: Josh Boyer <jwboyer@redhat.com> > Cc: Randy Dunlap <rdunlap@xenotime.net> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Michal Marek <mmarek@suse.com> > Signed-off-by: Chun-Yi Lee <jlee@suse.com> > Signed-off-by: David Howells <dhowells@redhat.com> > --- > kernel/Makefile | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/kernel/Makefile b/kernel/Makefile > index bc010ee..582fa7a 100644 > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -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)))) > -- > 1.6.4.2
| |