From patchwork Mon Apr 30 22:51:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 906896 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rkpwu7QB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Zfzq0qqSz9s0n for ; Tue, 1 May 2018 08:56:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753482AbeD3W4i (ORCPT ); Mon, 30 Apr 2018 18:56:38 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:36821 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751506AbeD3W4g (ORCPT ); Mon, 30 Apr 2018 18:56:36 -0400 Received: by mail-pf0-f177.google.com with SMTP id w129so2449302pfd.3; Mon, 30 Apr 2018 15:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CNDMwFXosr5Y/SlLXoKkfedq9gBVNnKeMtjvRjiM870=; b=rkpwu7QBEND/NOVNLwXdexwKGYNPJSgH7HPJKqud29rOrObVSNc8jlcgPDquAz+Qyi OoSWGdVfwbXQ7nude76J9rqeR86PRheR/OgwFmqSWil9o9VSUUX8D6wH7wjZOz9Qe5tj EdZxNjcvoC/VD9yG/e+4IYxtxayTiiOfduMLQsKO1e/WkuXpPlSggs6sf/D9+zRiodgt 9O6q6tBzdGjSQjXgP1pJuTpeRg/J6+06OROka59YLAtmPgrin3qnndJFQXtrXLQAluz5 mPVkp2W7MCL4BJ7lnPp5f3hkq7n+OGvy5YqhXh+kdvfcnrp1r7mIdpcH0r+NdUsKSOZL GS+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CNDMwFXosr5Y/SlLXoKkfedq9gBVNnKeMtjvRjiM870=; b=qoVOeNa703Jtgp3SCrDg2eD/jnRjGCsAWbknOxWxDCI13RtXclRD1W+fKqxHT4ES3c 0/RRtReuAmvDujlRoo7PDkzcp3pymQe0WlWXL+3fojUiwBEYQDNZcBkx2+TpL2sUZuVq v+vmQvpDkoQmjWFqT+Yxib3ybLftLr13iBqszc0LYwH7LEEYDx9KKpDNTf1U+di0lMDT sAkPIEaeVliECGpw7TNjVX4gUQP8y5N4D0SOGLpVGw3s2tujT0iMpPLPuJGyWy7W5ogS Rb7gAj55xMXlSE92qwVdxljxFdqY3kG9omjlKxE/igTRzKGP2IijSqnqKjtqIPmtpLlv vXsw== X-Gm-Message-State: ALQs6tCJ7+PUjlqNScoC41pTrhWAEZaqUqccGsXO2ykl0xt8GfT0yXqO FX8FJi3GQBLTsiTjpvLyX/ZMAWsq X-Google-Smtp-Source: AB8JxZpDuXDJnc12FlsqIzXH9ddnkMoyH+pQwQ2aJRs5v42vBOXPCt6k+jbV+gGtyuYKjdT2yXleTg== X-Received: by 2002:a65:5c4d:: with SMTP id v13-v6mr11244057pgr.428.1525128995438; Mon, 30 Apr 2018 15:56:35 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id b15sm12969305pfi.111.2018.04.30.15.56.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Apr 2018 15:56:34 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org, "Theodore Y . Ts'o" Cc: Jaegeuk Kim , linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, Eric Biggers Subject: [PATCH v2 00/15] fscrypt: improved logging and other cleanups Date: Mon, 30 Apr 2018 15:51:34 -0700 Message-Id: <20180430225149.183514-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers Hello, here's yet another round of cleanups for fscrypt. Please consider for v4.18. These are all patches I've sent out previously. The series is based on v4.17-rc3. Patches 1-12 mostly remove unnecessary or redundant code from a number of different places; nothing particularly noteworthy. Note: to avoid a merge conflict with f2fs/dev, I've dropped the patch "fscrypt: remove WARN_ON_ONCE() when decryption fails". Patch 13 switches the existing warning and error messages in fscrypt over to use a common logging function, which is ratelimited and includes the filesystem name (->s_id) when available as well as a consistent prefix of "fscrypt:". Patches 14-15 are optimizations and cleanups for key lookup and key derivation. They are extracted from the patch "fscrypt: refactor finding and deriving key" I had originally sent as part of the series "fscrypt: filesystem-level keyring and v2 policy support". But I think they're useful changes by themselves, so no need to wait on them. Eric Biggers (15): fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabled fscrypt: clean up after fscrypt_prepare_lookup() conversions fscrypt: remove unnecessary NULL check when allocating skcipher fscrypt: remove error messages for skcipher_request_alloc() failure fscrypt: remove stale comment from fscrypt_d_revalidate() fscrypt: don't clear flags on crypto transform fscrypt: don't special-case EOPNOTSUPP from fscrypt_get_encryption_info() fscrypt: drop max_namelen check from fname_decrypt() fscrypt: drop empty name check from fname_decrypt() fscrypt: make fscrypt_operations.max_namelen an integer fscrypt: remove unnecessary check for non-logon key type fscrypt: remove internal key size constants fscrypt: use a common logging function fscrypt: separate key lookup from key derivation fscrypt: only derive the needed portion of the key fs/crypto/crypto.c | 36 ++++-- fs/crypto/fname.c | 32 ++--- fs/crypto/fscrypt_private.h | 19 +-- fs/crypto/hooks.c | 5 +- fs/crypto/keyinfo.c | 200 +++++++++++++++++--------------- fs/ext4/super.c | 8 +- fs/f2fs/super.c | 8 +- fs/ubifs/crypto.c | 10 +- include/linux/fs.h | 4 +- include/linux/fscrypt_notsupp.h | 10 -- include/linux/fscrypt_supp.h | 16 +-- 11 files changed, 161 insertions(+), 187 deletions(-)