From patchwork Tue May 23 00:39:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9741575 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 CE61D601C2 for ; Tue, 23 May 2017 00:40:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF2DD2876B for ; Tue, 23 May 2017 00:40:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B423728779; Tue, 23 May 2017 00:40:11 +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 692472876B for ; Tue, 23 May 2017 00:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935285AbdEWAkK (ORCPT ); Mon, 22 May 2017 20:40:10 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35720 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934067AbdEWAkJ (ORCPT ); Mon, 22 May 2017 20:40:09 -0400 Received: by mail-pf0-f194.google.com with SMTP id u26so23429678pfd.2; Mon, 22 May 2017 17:40:09 -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=F14DeJAF/HYIntHtcPzrIvdzHFif5pJdKtQunC87CWI=; b=HnTH4BFHiW6wLCf77JwRF3A/c1EH2r/RUPWSTvsxDBRXRI1toK0s2lAMWcj5uVqN0I OcxLwim3qCxjN9VOvAOOjAS++0qwWwJ1PYGqAW5muPhbaM2yVXdWIGjEREWIohXpvkvY GpC2CzeHUfnEEDAYBnXBKBNc3ZuiBeAqGCATqYfApemd985Uw94W099JJvKog/XxP2ki 0Vc23RD93rHLudBwGdvr28vBQHbKNsLTcHTfZfog0fj529MOefP3gsdHhDf3jUAY53Dl V6Dj4TQdY76wnP9kKUTZ6vaL7hzrdu4tSM+lSF+MUtcBcZtkZv59zGRuh6e3WVyGQ3QG lMJg== 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=F14DeJAF/HYIntHtcPzrIvdzHFif5pJdKtQunC87CWI=; b=F0pQTfRmrD+8lZ/5S5yUUWXfwrllUIYmdpG7QnARjVBsjXefr2Eh4tXvrJ8lJDnjUt ElJ1FIVcql22JdBysKRZB2rCfVlGo1gkQpkNh9wU++6/+PCKWj1hQc/jROlqLREdYSWY 0EvKca7i82rgu+WFcJAJNmrwYcnJ1kUTBDtACCmOh9PLRZBf6h8i3HeHSVeWENmBE1f2 r4Uj/A3pnsnBc+touF+3YlMiVP2z5s3l27O4gSIBmMjnOOusLCOzqXUBek+X9i9EmBtS UUK72Yr0duEAY/UrRWLaz3saOwtRiqAIUNBQu5mqQ78BJXGwmJshtddeyiXv24y9pbwy AkLw== X-Gm-Message-State: AODbwcBxja3kRgtqjUUC6NbzPEg4sAl8DkpeyhRnpe3ZUwXHSqVHCehu uJU2/pKySan4nw== X-Received: by 10.84.140.164 with SMTP id 33mr32347445plt.142.1495500008714; Mon, 22 May 2017 17:40:08 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 17:40:08 -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 4/4] f2fs: don't bother checking for encryption key in ->write_iter() Date: Mon, 22 May 2017 17:39:45 -0700 Message-Id: <20170523003945.14279-5-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 written to, 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 ->write_iter(). This code was also broken in that it wouldn't actually have failed if the key was in fact unavailable. Signed-off-by: Eric Biggers Acked-by: Chao Yu --- fs/f2fs/file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index ff4db3efc0ac..3ccc63089a47 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2318,11 +2318,6 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) struct blk_plug plug; ssize_t ret; - if (f2fs_encrypted_inode(inode) && - !fscrypt_has_encryption_key(inode) && - fscrypt_get_encryption_info(inode)) - return -EACCES; - inode_lock(inode); ret = generic_write_checks(iocb, from); if (ret > 0) {