From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45F38ECAAA1 for ; Sun, 23 Oct 2022 05:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229610AbiJWFVN (ORCPT ); Sun, 23 Oct 2022 01:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbiJWFVN (ORCPT ); Sun, 23 Oct 2022 01:21:13 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0B846BD6F; Sat, 22 Oct 2022 22:21:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id C70B6CE091A; Sun, 23 Oct 2022 05:21:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60BD8C433D6; Sun, 23 Oct 2022 05:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666502467; bh=dasRCl8KgIolT33SnyjsTcXg1Das0YUyzkCMoGYPv9w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=T9Z1GP2FtahJXo4R0l9FL6uKFrjBBbYwcfMb8g1qW0XpuEcZR54Wo3/titEgBE2r0 xsrniuNLRhS3QNtq2WXBAZ9Hh55Zv7xa/ZdXKZASLWIjZ7+qCqbcPXDSdkj9yzghUd x2kISfwEO27+A0/ZvzsranXbN5TsPeOKAYqzL/VQAS+PRw2oRHjwylu21ILVy0yKe7 kYx22a7pyhrvWKxWU5TELbu0pg/2PLow6QxuiQoOB4PmD6Yg0Q5vwJzgXlyPVd1hFy WRX7XmrqOenuTPUDh94fvat+9iWdMhdPCTd2Gt5bqMloZYvllTlrcoNZI6QBDBlP3d pZ7t3O2uJCB6g== Date: Sun, 23 Oct 2022 08:21:00 +0300 From: Jarkko Sakkinen To: Nikolaus Voss Cc: Mimi Zohar , David Howells , James Morris , "Serge E. Hallyn" , Yael Tzur , Cyril Hrubis , Petr Vorel , linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4] KEYS: encrypted: fix key instantiation with user-provided data Message-ID: References: <20221013064308.857011E25@mail.steuer-voss.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: On Sun, Oct 23, 2022 at 08:18:58AM +0300, Jarkko Sakkinen wrote: > On Thu, Oct 13, 2022 at 08:39:58AM +0200, Nikolaus Voss wrote: > > Commit cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided > > decrypted data") added key instantiation with user provided decrypted data. > > The user data is hex-ascii-encoded but was just memcpy'ed to the binary buffer. > > Fix this to use hex2bin instead. > > > > Old keys created from user provided decrypted data saved with "keyctl pipe" > > are still valid, however if the key is recreated from decrypted data the > > old key must be converted to the correct format. This can be done with a > > small shell script, e.g.: > > > > BROKENKEY=abcdefABCDEF1234567890aaaaaaaaaa > > NEWKEY=$(echo -ne $BROKENKEY | xxd -p -c32) > > keyctl add user masterkey "$(cat masterkey.bin)" @u > > keyctl add encrypted testkey "new user:masterkey 32 $NEWKEY" @u > > > > It is encouraged to switch to a new key because the effective key size > > of the old keys is only half of the specified size. > > > > The corresponding test for the Linux Test Project ltp has also been > > fixed (see link below). > > > > Fixes: cd3bc044af48 ("KEYS: encrypted: Instantiate key with user-provided decrypted data") > > Cc: stable > > Link: https://lore.kernel.org/ltp/20221006081709.92303897@mail.steuer-voss.de/ > > Signed-off-by: Nikolaus Voss > > --- > > Changes > > ======= > > v4: - fixed link > > v3: - use generated random key in example, reformat commit message > > v2: - clarify commit message, add example to recover old/broken keys > > - improve example in Documentation/security/keys/trusted-encrypted.rst > > - add link to ltp patch > > > > Documentation/security/keys/trusted-encrypted.rst | 3 ++- > > security/keys/encrypted-keys/encrypted.c | 6 +++--- > > 2 files changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst > > index 0bfb4c339748..9bc9db8ec651 100644 > > --- a/Documentation/security/keys/trusted-encrypted.rst > > +++ b/Documentation/security/keys/trusted-encrypted.rst > > @@ -350,7 +350,8 @@ Load an encrypted key "evm" from saved blob:: > > > > Instantiate an encrypted key "evm" using user-provided decrypted data:: > > > > - $ keyctl add encrypted evm "new default user:kmk 32 `cat evm_decrypted_data.blob`" @u > > + $ evmkey=$(dd if=/dev/urandom bs=1 count=32 | xxd -c32 -p) > > + $ keyctl add encrypted evm "new default user:kmk 32 $evmkey" @u > > 794890253 > > > > $ keyctl print 794890253 > > diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c > > index e05cfc2e49ae..1e313982af02 100644 > > --- a/security/keys/encrypted-keys/encrypted.c > > +++ b/security/keys/encrypted-keys/encrypted.c > > @@ -627,7 +627,7 @@ static struct encrypted_key_payload *encrypted_key_alloc(struct key *key, > > pr_err("encrypted key: instantiation of keys using provided decrypted data is disabled since CONFIG_USER_DECRYPTED_DATA is set to false\n"); > > return ERR_PTR(-EINVAL); > > } > > - if (strlen(decrypted_data) != decrypted_datalen) { > > + if (strlen(decrypted_data) != decrypted_datalen * 2) { > > pr_err("encrypted key: decrypted data provided does not match decrypted data length provided\n"); > > return ERR_PTR(-EINVAL); > > } > > @@ -791,8 +791,8 @@ static int encrypted_init(struct encrypted_key_payload *epayload, > > ret = encrypted_key_decrypt(epayload, format, hex_encoded_iv); > > } else if (decrypted_data) { > > get_random_bytes(epayload->iv, ivsize); > > - memcpy(epayload->decrypted_data, decrypted_data, > > - epayload->decrypted_datalen); > > + ret = hex2bin(epayload->decrypted_data, decrypted_data, > > + epayload->decrypted_datalen); > > } else { > > get_random_bytes(epayload->iv, ivsize); > > get_random_bytes(epayload->decrypted_data, epayload->decrypted_datalen); > > -- > > 2.34.1 > > > > > Reviewed-by: Jarkko Sakkinen > > Unless there is opposing views, I can pick this. Actually, taking this back: please fix the checkpatch warnings first. BR, Jarkko