From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932384AbbE2CzF (ORCPT ); Thu, 28 May 2015 22:55:05 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:26180 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320AbbE2Cy5 (ORCPT ); Thu, 28 May 2015 22:54:57 -0400 X-AuditID: cbfee61b-f79416d0000014c0-be-5567d4ff87c0 From: Chao Yu To: "'Jaegeuk Kim'" Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <00d401d096d2$a58db310$f0a91930$@samsung.com> <20150528170726.GB11631@jaegeuk-mac02.mot.com> <20150529022920.GA18700@jaegeuk-mac02.mot.com> In-reply-to: <20150529022920.GA18700@jaegeuk-mac02.mot.com> Subject: RE: [f2fs-dev] [PATCH 1/3] f2fs crypto: check context consistent for rename2 Date: Fri, 29 May 2015 10:54:14 +0800 Message-id: <002701d099ba$d7868af0$8693a0d0$@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: AQJbNGdwtX9YOc8Rx51vUcoFt+5M2AGMXpmaAVRl65ScZgUEUA== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsVy+t9jAd3/V9JDDZbsU7J4sn4Ws8WlRe4W l3fNYXNg9ti0qpPNY/eCz0wenzfJBTBHcdmkpOZklqUW6dslcGUc2vmdveC+RMWLP4eYGxgP CHcxcnJICJhIHP+wlQXCFpO4cG89G4gtJLCIUeLyS7cuRi4g+xWjxMSGPWBFbAIqEss7/jOB 2CICahK9+6YA2RwczAIeEruOlULUz2aUWPnvN1gNp4C1xJxnb5hBbGGBcImdU76zg9SzCKhK /F3HD2LyClhKPJ6jDFLBKyAo8WPyPbBNzAJaEut3HmeCsOUlNq95ywxxpoLEjrOvGUFaRQSc JJ4cTYIoEZfYeOQWywRGoVlIJs1CMmkWkkmzkLQsYGRZxSiaWpBcUJyUnmukV5yYW1yal66X nJ+7iREc6M+kdzCuarA4xCjAwajEw6swJy1UiDWxrLgy9xCjBAezkgjvrs3poUK8KYmVValF +fFFpTmpxYcYpTlYlMR5T+b7hAoJpCeWpGanphakFsFkmTg4pRoYJ+96/FSEPz51SrFGecZm XqsXwh7sEe/4lmqs8z9Yd9r2ZPS1Donngp0/2S13F8ovDnurHtt0/apHkHPvkykS123zFLe7 XZBZsvd7p7tKwMXkTbU+cjpG3Lkrts7ZuVdWcdmXt0LzJ1ho/bk69fWqdqlbvvPeKJwNz7nh rKx6olXA0a6i7MkkJZbijERDLeai4kQA8j+df3ACAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jaegeuk, > -----Original Message----- > From: Jaegeuk Kim [mailto:jaegeuk@kernel.org] > Sent: Friday, May 29, 2015 10:29 AM > To: Chao Yu > Cc: linux-kernel@vger.kernel.org; linux-f2fs-devel@lists.sourceforge.net > Subject: Re: [f2fs-dev] [PATCH 1/3] f2fs crypto: check context consistent for rename2 > > On Thu, May 28, 2015 at 10:07:26AM -0700, Jaegeuk Kim wrote: > > Hi Chao, > > > > On Mon, May 25, 2015 at 06:07:02PM +0800, Chao Yu wrote: > > > For exchange rename, we should check context consistent of encryption > > > between new_dir and old_inode or old_dir and new_inode. Otherwise > > > inheritance of parent's encryption context will be broken. > > > > > > Signed-off-by: Chao Yu > > > --- > > > fs/f2fs/namei.c | 9 +++++++++ > > > 1 file changed, 9 insertions(+) > > > > > > diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c > > > index daed09c..3188464 100644 > > > --- a/fs/f2fs/namei.c > > > +++ b/fs/f2fs/namei.c > > > @@ -754,6 +754,15 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry > *old_dentry, > > > int old_nlink = 0, new_nlink = 0; > > > int err = -ENOENT; > > > > > > + if ((old_dir != new_dir) && > > > + (!f2fs_is_child_context_consistent_with_parent(new_dir, > > > + old_inode) || > > > + !f2fs_is_child_context_consistent_with_parent(old_dir, > > > + new_inode))) { > > > + err = -EPERM; > > > + goto out; > > > + } > > > + > > > > Seems like we need this? > > > > --- > > fs/f2fs/namei.c | 15 +++++++++++++++ > > 1 file changed, 15 insertions(+) > > > > diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c > > index 55d0d27..4772c14 100644 > > --- a/fs/f2fs/namei.c > > +++ b/fs/f2fs/namei.c > > @@ -756,6 +756,21 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry > *old_dentry, > > int old_nlink = 0, new_nlink = 0; > > int err = -ENOENT; > > > > + if (old_dir != new_dir) { > > + if (f2fs_encrypted_inode(new_dir) && > > + !f2fs_is_child_context_consistent_with_parent(new_dir, > > + old_inode)) { > > + err = -EPERM; > > + goto out; > > + } > > + if (f2fs_encrypted_inode(old_dir) && > > + !f2fs_is_child_context_consistent_with_parent(old_dir, > > + new_inode)) { > > + err = -EPERM; > > + goto out; > > + } > > + } > > It needs to sync with ext4 patch published by Ted. No objection, please go ahead. Previously, I remove f2fs_encrypted_inode(parent_inode) condition because in f2fs_is_child_context_consistent_with_parent we have the same verification. /* no restrictions if the parent directory is not encrypted */ if (!f2fs_encrypted_inode(parent)) return 1; Thanks, > > Thanks, > > > + > > f2fs_balance_fs(sbi); > > > > old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page); > > -- > > 2.1.1 > > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > > Linux-f2fs-devel mailing list > > Linux-f2fs-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel