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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10177C33CA1 for ; Mon, 20 Jan 2020 22:34:26 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D611E217F4; Mon, 20 Jan 2020 22:34:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="czu8VJPU"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="i+nPEMCM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="n9BG408G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D611E217F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1itfcn-0001Z2-0P; Mon, 20 Jan 2020 22:34:25 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1itfcl-0001Yv-Qf for linux-f2fs-devel@lists.sourceforge.net; Mon, 20 Jan 2020 22:34:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HcTJ4nsNh6Zk28YMD/D7fP8Rr//qaiQtBrVURmyipik=; b=czu8VJPUYNIbqmpYyoA/5AfUDI 1GUQTGKXrvrw0UncK5edLDohO2X8Pw+vNYqt2daMSDa5AvBhuv1qmupoDWUT6T8CUZ5jYZ2vfVQE9 ft2JBYZIuOT8wneeIXmfA68oyVobKAZEBnQmHlU0PhgJEYIU7n29NrVdhMmeOk9dV9JI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=HcTJ4nsNh6Zk28YMD/D7fP8Rr//qaiQtBrVURmyipik=; b=i +nPEMCM5bzYya3foP/+j54MIVJuMEci+KZRpLvSqlg3ZUsEe0IXW7vnb25SjrpidmXVvB0pa6nXQP MV1wuafg26nZwLR7BQQ4wN3rbrMaVZd48LUV6hXYLI5XY3m04vLpjsxdIYLtHvPUFrnz5+174Ah5p 2UscK9XptkVBaejA=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1itfck-00FV77-HC for linux-f2fs-devel@lists.sourceforge.net; Mon, 20 Jan 2020 22:34:23 +0000 Received: from sol.hsd1.ca.comcast.net (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A5FBF217F4; Mon, 20 Jan 2020 22:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579559657; bh=xm885UhKFUwKfgBkYWfnG/AC3Rw6vyxcGdpz/w5UOxs=; h=From:To:Cc:Subject:Date:From; b=n9BG408GF/aokCw8EG9MBQ9hJw9mAgpR6LRC5KJXhFvrUD8dUEMcz1fPCmgxfOxnK FYltkiqo8UTJrZL597rrakuG7LCaY6g0rVjw3rHQFWyQaaJluloPm74WLLPuT+6kjF HwzLBOeRmONd/Z5cEVB5lRpaCnrKE0dDiJHJ32rU= From: Eric Biggers To: linux-fscrypt@vger.kernel.org Date: Mon, 20 Jan 2020 14:31:55 -0800 Message-Id: <20200120223201.241390-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Headers-End: 1itfck-00FV77-HC Subject: [f2fs-dev] [PATCH v5 0/6] fscrypt preparations for encryption+casefolding X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Rosenberg , Gabriel Krisman Bertazi , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, Richard Weinberger , linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net This is a cleaned up and fixed version of the fscrypt patches to prepare for directories that are both encrypted and casefolded. Patches 1-3 start deriving a SipHash key for the new dirhash method that will be used by encrypted+casefolded directories. To avoid unnecessary overhead, we only do this if the directory is actually casefolded. Patch 4 fixes a bug in UBIFS where it didn't gracefully handle invalid hash values in fscrypt no-key names. This is an existing bug, but the new fscrypt no-key name format (patch 6) made it much easier to trigger; it started being hit by 'kvm-xfstests -c ubifs -g encrypt'. Patch 5 updates UBIFS to make it ready for the new fscrypt no-key name format that always includes the dirhash. Patch 6 modifies the fscrypt no-key names to always include the dirhash, since with the new dirhash method the dirhash will no longer be computable from the ciphertext filename without the key. It also fixes a longstanding issue where there could be collisions in the no-key names, due to not using a proper cryptographic hash to abbreviate names. For more information see the main patch series, which includes the filesystem-specific changes: https://lkml.kernel.org/linux-fscrypt/20200117214246.235591-1-drosen@google.com/T/#u This applies to fscrypt.git#master. Changed v4 => v5: - Fixed UBIFS encryption to work with the new no-key name format. Daniel Rosenberg (3): fscrypt: don't allow v1 policies with casefolding fscrypt: derive dirhash key for casefolded directories fscrypt: improve format of no-key names Eric Biggers (3): fscrypt: clarify what is meant by a per-file key ubifs: don't trigger assertion on invalid no-key filename ubifs: allow both hash and disk name to be provided in no-key names Documentation/filesystems/fscrypt.rst | 40 +++-- fs/crypto/Kconfig | 1 + fs/crypto/fname.c | 239 ++++++++++++++++++++------ fs/crypto/fscrypt_private.h | 19 +- fs/crypto/hooks.c | 44 +++++ fs/crypto/keysetup.c | 81 ++++++--- fs/crypto/keysetup_v1.c | 4 +- fs/crypto/policy.c | 7 + fs/inode.c | 3 +- fs/ubifs/dir.c | 6 +- fs/ubifs/journal.c | 4 +- fs/ubifs/key.h | 1 - include/linux/fscrypt.h | 94 +++------- 13 files changed, 365 insertions(+), 178 deletions(-) -- 2.25.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel