linux-kernel - Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <75918f49-5670-766a-09a2-f29aef95f2ca@digikod.net>
Date:   Thu, 9 Jun 2022 19:17:38 +0200
From:   Mickaël Salaün <mic@...ikod.net>
To:     Masahiro Yamada <masahiroy@...nel.org>,
        David Howells <dhowells@...hat.com>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Jarkko Sakkinen <jarkko@...nel.org>, keyrings@...r.kernel.org,
        Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab



On 09/06/2022 19:12, Mickaël Salaün wrote:
> 
> On 06/06/2022 18:49, Masahiro Yamada wrote:
>> On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@...hat.com> wrote:
>>>
>>> There's a rule in certs/Makefile for which the command begins with eight
>>> spaces.  This results in:
>>>
>>>          ../certs/Makefile:21: FORCE prerequisite is missing
>>>          ../certs/Makefile:21: *** missing separator.  Stop.
>>>
>>> Fix this by turning the spaces into a tab.
>>>
>>> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are 
>>> valid")
>>> Signed-off-by: David Howells <dhowells@...hat.com>
>>> cc: Mickaël Salaün <mic@...ux.microsoft.com>
>>> cc: Jarkko Sakkinen <jarkko@...nel.org>
>>> cc: keyrings@...r.kernel.org
>>
>>
>> Not only 8-space indentation, but also:
>>
>>    - config_filename does not exist
>>    - $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
>>    - $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
> 
> These are imported helpers (not only used for this hash list BTW), hence 
> not defined in this Makefile.

Well, they were defined in scripts/Kbuild.include but they are gone 
since your commit b8c96a6b466c ("certs: simplify $(srctree)/ handling 
and remove config_filename macro").

I guess it just happens during the merge. We need to fix that.


> 
>>
>>
>>> ---
>>>
>>>   certs/Makefile |    2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/certs/Makefile b/certs/Makefile
>>> index bb904f90f139..cb1a9da3fc58 100644
>>> --- a/certs/Makefile
>>> +++ b/certs/Makefile
>>> @@ -18,7 +18,7 @@ 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)) 
>>>
>>> +       $(call 
>>> if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) 
>>>
>>>   obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
>>>   else
>>>   obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>>>
>>>
>>
>>
>> -- 
>> Best Regards
>> Masahiro Yamada