From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbcBNK7V (ORCPT ); Sun, 14 Feb 2016 05:59:21 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:55741 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbcBNK7S (ORCPT ); Sun, 14 Feb 2016 05:59:18 -0500 X-AuditID: cbfee61a-f79266d000003652-a2-56c05e057ca9 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, tytso@mit.edu Subject: [PATCH 7/7] f2fs crypto: handle unexpected lack of encryption keys Date: Sun, 14 Feb 2016 18:58:35 +0800 Message-id: <010001d16716$bfda6f00$3f8f4d00$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFnFnBxuR/N6iufRlGSlGTDGaF54w== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsVy+t9jQV3WuANhBk1/dC2erJ/FbHFpkbvF 5V1z2Cxae36yO7B4bFrVyeaxe8FnJo+mM0eZPT5vkgtgieKySUnNySxLLdK3S+DKeHx4G3vB eZ6KF02qDYyTuLoYOTkkBEwkeme+YIWwxSQu3FvP1sXIxSEkMItRYvv8pYwQzitGicUTfjGC VLEJqEgs7/jPBGKLANmHFl1mB7GZBSIlmtZ8ZwOxhQW8Jeaf2wJWwyKgKjGr/TBYnFfAUuJK zw8oW1Dix+R7LBC9WhKbtzWxQtjyEpvXvGWGuEhBYsfZ14wQu/Qkmrcfg6oRl9h45BbLBEag MxFGzUIyahaSUbOQtCxgZFnFKJFakFxQnJSea5iXWq5XnJhbXJqXrpecn7uJERzYz6R2MB7c 5X6IUYCDUYmHd8fK/WFCrIllxZW5hxglOJiVRHgdog+ECfGmJFZWpRblxxeV5qQWH2KU5mBR Eud9/H9dmJBAemJJanZqakFqEUyWiYNTqoFxR/qyPXP74gqPsRTs+mNgVx0XmKqwZPHbnlq1 vo7zUXOOVcsGdfdeC2rVnep7fMsv5ayYBPmVJSVKj7/8sNO0Lj8UzmumH2cvqn3sWaTpjYNd XtOE1BP0Z752tLfz0XiQcVDNcl3y020GmWHP5+3XjhL63V1as54/2oDj5Y8Z8WImVclxLUos xRmJhlrMRcWJAAuG5/VoAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch syncs f2fs with commit abdd438b26b4 ("ext4 crypto: handle unexpected lack of encryption keys") from ext4. Fix up attempts by users to try to write to a file when they don't have access to the encryption key. Signed-off-by: Theodore Ts'o Signed-off-by: Chao Yu --- fs/f2fs/crypto_policy.c | 3 ++- fs/f2fs/file.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/crypto_policy.c b/fs/f2fs/crypto_policy.c index 0fb08b0..4d7d7ff 100644 --- a/fs/f2fs/crypto_policy.c +++ b/fs/f2fs/crypto_policy.c @@ -192,7 +192,8 @@ int f2fs_inherit_context(struct inode *parent, struct inode *child, return res; ci = F2FS_I(parent)->i_crypt_info; - BUG_ON(ci == NULL); + if (ci == NULL) + return -ENOKEY; ctx.format = F2FS_ENCRYPTION_CONTEXT_FORMAT_V1; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 05f5f2f..8dea195 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -424,6 +424,8 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) err = f2fs_get_encryption_info(inode); if (err) return 0; + if (!f2fs_encrypted_inode(inode)) + return -ENOKEY; } /* we don't need to use inline_data strictly */ @@ -443,7 +445,9 @@ static int f2fs_file_open(struct inode *inode, struct file *filp) if (!ret && f2fs_encrypted_inode(inode)) { ret = f2fs_get_encryption_info(inode); if (ret) - ret = -EACCES; + return -EACCES; + if (!f2fs_encrypted_inode(inode)) + return -ENOKEY; } return ret; } -- 2.7.0.2.g1b0b6dd