Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2439199rwb; Mon, 7 Nov 2022 13:20:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf7qAGulJZMgY+t2XJjG2Nk2lFgfaFd+BQp0Blq1nIVGSJIK0o4JmDNap9nZX8tluYeRYoTK X-Received: by 2002:a50:fe96:0:b0:466:8766:7e7d with SMTP id d22-20020a50fe96000000b0046687667e7dmr3666827edt.427.1667856004902; Mon, 07 Nov 2022 13:20:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667856004; cv=none; d=google.com; s=arc-20160816; b=1I429yELQCLISB+SlKqAwsOuaKaEceHJ7N8P/WTOgdm2/+k8LtgI22bcen6njq/oYH U1Dog9c+eJHkhdl9kI0uiranlBCdpwZH5QbeO2bLtPCIseRZP3O1JxQ7apMUL7zjlP/3 H00i2YzRY3t8rKiMzmS45nRsPjJk3OwBaas5NpuGny9FScSIZu84wYJ5WBTrwHp9tQhG Xx0kIOi0eiBAk74oyTQq6ybOhRlbW8q8YZ/1gpL4g/W5pY6Wabblz9HOJys1+A4YL5wa xdW3tZVX8bVtXt/lJ3qU4aszgIxzKipIXDcSy/DlM8PZHwJXmFecGrjhWhMSbibczrtd NEwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=XZH3p1ESqml/Yeex8CInsc0zJX/pFS5rLfrrEqtTcNk=; b=DY09qpTlVf87yDq/OfTFAHZYPrPwcujjm0pwAmWASLoG9y9uZy9jXLU5z9cgxph/Di xL2KA5CkdBwweub/M/lqDQemIe1pb9Wb3sMK0FL1ZExB8bGAflwgCTYbo9EuZdZ2/4Ti eTDgV1TZnfGdYtCSurTx42IGkIN8v3e5Hk+XSeLFmtoOhhtQKG1ZVWEqI0mj1b6i9cKN fJkAVceWrTQD8KlVa0uXr4gyPS2Y7w4KVcWxJ0eMqyTad1Rmicb7wweyepFw6Ceqx4MD DKAfMfR1tq2DhGo/9SXiP+cYW8NhicQ+FTpESPqCF62Ij9paTo+pY66ny0YT3dYMpPaD 5KuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@digikod.net header.s=20191114 header.b=1FSixZE5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg10-20020a170907a40a00b0079e925b0200si11652608ejc.59.2022.11.07.13.19.43; Mon, 07 Nov 2022 13:20:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@digikod.net header.s=20191114 header.b=1FSixZE5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232414AbiKGTkS (ORCPT + 92 others); Mon, 7 Nov 2022 14:40:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231589AbiKGTkP (ORCPT ); Mon, 7 Nov 2022 14:40:15 -0500 X-Greylist: delayed 11954 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 07 Nov 2022 11:40:13 PST Received: from smtp-1909.mail.infomaniak.ch (smtp-1909.mail.infomaniak.ch [185.125.25.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54F571002 for ; Mon, 7 Nov 2022 11:40:13 -0800 (PST) Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4N5hQg66hwzMpnwh; Mon, 7 Nov 2022 20:40:11 +0100 (CET) Received: from ns3096276.ip-94-23-54.eu (unknown [23.97.221.149]) by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4N5hQf1g6kzMppr8; Mon, 7 Nov 2022 20:40:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=digikod.net; s=20191114; t=1667850011; bh=VH93TVKDv81HuBQ2xHBKdoTVjfRzV8BT2O9T7VUP1yU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=1FSixZE59TqN7/U2wk6U358AgKcPAc215cfWjYqdZd8499FHiwXvxC4hhrjTocp+S GrM+Uau+gfxhk+Ko1o7Y75FwYY4xhbblREVkyllHPImuHcXA27SxxrF2mAXsPwUxEz bmpRUBLo4dihIijNPrr10GQ6EDBCfJ0/57vGOnqE= Message-ID: Date: Mon, 7 Nov 2022 20:40:09 +0100 MIME-Version: 1.0 User-Agent: Subject: Re: [PATCH] certs: Prevent spurious errors on repeated blacklisting Content-Language: en-US To: =?UTF-8?Q?Thomas_Wei=c3=9fschuh?= Cc: David Howells , David Woodhouse , Jarkko Sakkinen , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Pearson , Eric Snowberg , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org References: <20221104014704.3469-1-linux@weissschuh.net> <3b997266-067c-975c-911a-da146fe9033a@digikod.net> <8692915f-437c-56fd-8984-d6febf533fa9@digikod.net> <706c75af-9569-42fd-ba68-533ed931d55d@t-8ch.de> From: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= In-Reply-To: <706c75af-9569-42fd-ba68-533ed931d55d@t-8ch.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/11/2022 17:35, Thomas Weißschuh wrote: > On 2022-11-07 17:20+0100, Mickaël Salaün wrote: >> On 07/11/2022 16:55, Thomas Weißschuh wrote: >>> On 2022-11-07 14:12+0100, Mickaël Salaün wrote: >>>> This is a follow-up of >>>> https://lore.kernel.org/r/c8c65713-5cda-43ad-8018-20f2e32e4432@t-8ch.de >>>> >>>> Added Jarkko, Mark Pearson, Eric Snowberg and more ML in Cc. >>>> >>>> >>>> On 04/11/2022 02:47, Thomas Weißschuh wrote: >>>>> When the blacklist keyring was changed to allow updates from the root >>>>> user it gained an ->update() function that disallows all updates. >>>>> When the a hash is blacklisted multiple times from the builtin or >>>>> firmware-provided blacklist this spams prominent logs during boot: >>>>> >>>>> [ 0.890814] blacklist: Problem blacklisting hash (-13) >>>>> >>>>> As all these repeated calls to mark_raw_hash_blacklisted() would create >>>>> the same keyring entry again anyways these errors can be safely ignored. >>>> >>>> These errors can indeed be safely ignored, however they highlight issues >>>> with some firmware vendors not checking nor optimizing their blocked hashes. >>>> This raises security concerns, and it should be fixed by firmware vendors. >>> >>> Thanks, I was not aware that these are worth fixing. >>> >>>>> Fixes: 6364d106e041 ("certs: Allow root user to append signed hashes to the blacklist keyring") >>>>> Signed-off-by: Thomas Weißschuh >>>>> --- >>>>> certs/blacklist.c | 4 +++- >>>>> 1 file changed, 3 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/certs/blacklist.c b/certs/blacklist.c >>>>> index 41f10601cc72..5f7f2882ced7 100644 >>>>> --- a/certs/blacklist.c >>>>> +++ b/certs/blacklist.c >>>>> @@ -191,7 +191,9 @@ static int mark_raw_hash_blacklisted(const char *hash) >>>>> BLACKLIST_KEY_PERM, >>>>> KEY_ALLOC_NOT_IN_QUOTA | >>>>> KEY_ALLOC_BUILT_IN); >>>>> - if (IS_ERR(key)) { >>>>> + >>>>> + /* Blacklisting the same hash twice fails but would be idempotent */ >>>>> + if (IS_ERR(key) && PTR_ERR(key) != -EACCES) { >>>> >>>> We should not hide EACCES errors. This logs issues, which is correct for >>>> duplicate hashes, and can help firmware vendors to fix their database. I'd >>>> really like to see a different log message instead: change the duplicate >>>> entry error code from EACCES to EEXIST, and call pr_warn for this specific >>>> case. >>> >>> Returning EACCES would require some deeper changes to how the keyring is set up >> >> I guess you meant EEXIST? > > Indeed, sorry. > >>> or even changes to the keyring core itself to introduce a key_create() (without >>> update) function. >>> >>> Is this something you would take a look at, or should I try to do it? >>> (I have no previous knowledge about the keyring subsystem) >> >> Please take a look. I think it should not be too complex. > > Will do. > > My plan is to create a new function key_create() that does takes the core logic > of key_create_or_update() and fails with EEXIST if needed. > >>> In any case it probably would also be good to log the problematic hashes >>> themselves, so users can properly report the issue to their firmware vendors. >> >> Agree > > I'll send a patch for that, too. Good! Jarkko, David, any though? > > As for this patch's Fixes-tag, it could refer to either the commit that > introduced the logging in the first place or the one that actively started to > trigger it: > * 734114f8782f ("KEYS: Add a system blacklist keyring") > * 6364d106e041 ("certs: Allow root user to append signed hashes to the blacklist keyring") > > Personally I'd tend to use the latter. Even if commit 6364d106e041 is not directly the cause of the issue, it makes it visible, so I agree that you should keep the current Fixes tag. > >>>>> pr_err("Problem blacklisting hash (%ld)\n", PTR_ERR(key)); >>>>> return PTR_ERR(key); >>>>> } >>>>> >>>>> base-commit: ee6050c8af96bba2f81e8b0793a1fc2f998fcd20