From patchwork Tue May 23 00:39:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9741569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 78837601C2 for ; Tue, 23 May 2017 00:40:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 699EA2876F for ; Tue, 23 May 2017 00:40:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DB892876B; Tue, 23 May 2017 00:40:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B0AE2876B for ; Tue, 23 May 2017 00:40:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935218AbdEWAkD (ORCPT ); Mon, 22 May 2017 20:40:03 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:32852 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934067AbdEWAkC (ORCPT ); Mon, 22 May 2017 20:40:02 -0400 Received: by mail-pf0-f193.google.com with SMTP id f27so23440075pfe.0; Mon, 22 May 2017 17:40:02 -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:in-reply-to:references; bh=GzcezGdcAh1FwkuHd8ALa0K7Y1Kp3842Tfa4T9MRZuY=; b=FBNor863DWeb/bvPUprLkkxxdmFqa1kRcaG7sdMZw3yG3xrzycW170rQy7crEEjCh6 7AirMFw8sPHl+zKS/UcU6egnXHjzrsWM0yf7ENlb3CNCEkbzPd4bbiMGc9oPK2A+bXoV Je51AV3x+3aV8P9Ek47F8YFOCFQfM7K1/qSsjvkcyaDcaY30DnZSvNijlp2UNeNeuDiH mesh7/Kwki7oQhzEhueBXQHuzb11diiqu0wnQ8Sl5GtIygvwF0p6xCVgI35piKV4r1N7 0Ii/mHeciOTYeVYC14aUe54OWVTasU1exbQMnfjww8IJreDPZMMzCGz0rfx5lHSlmoZS QRUA== 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:in-reply-to :references; bh=GzcezGdcAh1FwkuHd8ALa0K7Y1Kp3842Tfa4T9MRZuY=; b=AwqwTDbwSND30YLZxOq0LCOx3yUHl+JaNHwlnfumE7Jh6HQcv1CIPHMFeyhvaNgYOK rr8JG/NF9gxP9y0cImR3p8Iqua9yEc2iVvWm9pog8uh312Bx76UKLUuaRtCqZl6UprRF hgX8t1onXzxKS6cwDq7IxaEFN52+QM7SWsYvMdnh24OrP4IQ/h4Up9J3K77dh7N1K8RO m4jGsvMjYgG8RxvNNpqrzeyrCk2j/BxGQo4EKTw1EW0RIUd5FSxnXYx8SHUhyoUrftyI h28iy1eTuCNYlMEVXyaDggGZUmrFEu660O19dR9zojaI2McjBwaM/jjOz2G/T44QROz3 IZvQ== X-Gm-Message-State: AODbwcCBvINsaQRbvTUWrAF+SQC7tks9NmCQo8Be5OT9ZTvZ1L6H/2/+ 8Z/ANywxeY2pvA== X-Received: by 10.84.192.37 with SMTP id b34mr32346590pld.174.1495500002193; Mon, 22 May 2017 17:40:02 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.39]) by smtp.gmail.com with ESMTPSA id l85sm18172985pfj.130.2017.05.22.17.40.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 17:40:01 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: Theodore Ts'o , Jaegeuk Kim , linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, Eric Biggers Subject: [PATCH 1/4] ext4: don't bother checking for encryption key in ->mmap() Date: Mon, 22 May 2017 17:39:42 -0700 Message-Id: <20170523003945.14279-2-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.0.303.g4ebf302169-goog In-Reply-To: <20170523003945.14279-1-ebiggers3@gmail.com> References: <20170523003945.14279-1-ebiggers3@gmail.com> Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Since only an open file can be mmap'ed, and we only allow open()ing an encrypted file when its key is available, there is no need to check for the key again before permitting each mmap(). Signed-off-by: Eric Biggers --- fs/ext4/file.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 831fd6beebf0..f0039867b086 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -345,13 +345,6 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) return -EIO; - if (ext4_encrypted_inode(inode)) { - int err = fscrypt_get_encryption_info(inode); - if (err) - return 0; - if (!fscrypt_has_encryption_key(inode)) - return -ENOKEY; - } file_accessed(file); if (IS_DAX(file_inode(file))) { vma->vm_ops = &ext4_dax_vm_ops;