| Message ID | 20211003043105.10453-3-linkinjeon@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] ksmbd: use buf_data_size instead of recalculation in smb3_decrypt_req() | expand |
Looks good to me. Acked-by: Hyunchul Lee <hyc.lee@gmail.com> 2021년 10월 3일 (일) 오후 1:31, Namjae Jeon <linkinjeon@kernel.org>님이 작성: > > Marios reported kernel oops from fuse driver when ksmbd call > mark_inode_dirty(). This patch directly update ->i_ctime after removing > mark_inode_ditry() and notify_change will put inode to dirty list. > > Cc: Tom Talpey <tom@talpey.com> > Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> > Cc: Ralph Böhme <slow@samba.org> > Cc: Steve French <smfrench@gmail.com> > Cc: Sergey Senozhatsky <senozhatsky@chromium.org> > Cc: Hyunchul Lee <hyc.lee@gmail.com> > Reported-by: Marios Makassikis <mmakassikis@freebox.fr> > Tested-by: Marios Makassikis <mmakassikis@freebox.fr> > Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> > --- > fs/ksmbd/smb2pdu.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c > index 4d1be224dd8e..ed8324f9c2bd 100644 > --- a/fs/ksmbd/smb2pdu.c > +++ b/fs/ksmbd/smb2pdu.c > @@ -5483,7 +5483,6 @@ static int set_file_basic_info(struct ksmbd_file *fp, > struct ksmbd_share_config *share) > { > struct iattr attrs; > - struct timespec64 ctime; > struct file *filp; > struct inode *inode; > struct user_namespace *user_ns; > @@ -5505,13 +5504,11 @@ static int set_file_basic_info(struct ksmbd_file *fp, > attrs.ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET); > } > > - if (file_info->ChangeTime) { > + attrs.ia_valid |= ATTR_CTIME; > + if (file_info->ChangeTime) > attrs.ia_ctime = ksmbd_NTtimeToUnix(file_info->ChangeTime); > - ctime = attrs.ia_ctime; > - attrs.ia_valid |= ATTR_CTIME; > - } else { > - ctime = inode->i_ctime; > - } > + else > + attrs.ia_ctime = inode->i_ctime; > > if (file_info->LastWriteTime) { > attrs.ia_mtime = ksmbd_NTtimeToUnix(file_info->LastWriteTime); > @@ -5557,11 +5554,9 @@ static int set_file_basic_info(struct ksmbd_file *fp, > return -EACCES; > > inode_lock(inode); > + inode->i_ctime = attrs.ia_ctime; > + attrs.ia_valid &= ~ATTR_CTIME; > rc = notify_change(user_ns, dentry, &attrs, NULL); > - if (!rc) { > - inode->i_ctime = ctime; > - mark_inode_dirty(inode); > - } > inode_unlock(inode); > } > return rc; > -- > 2.25.1 >
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index 4d1be224dd8e..ed8324f9c2bd 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -5483,7 +5483,6 @@ static int set_file_basic_info(struct ksmbd_file *fp, struct ksmbd_share_config *share) { struct iattr attrs; - struct timespec64 ctime; struct file *filp; struct inode *inode; struct user_namespace *user_ns; @@ -5505,13 +5504,11 @@ static int set_file_basic_info(struct ksmbd_file *fp, attrs.ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET); } - if (file_info->ChangeTime) { + attrs.ia_valid |= ATTR_CTIME; + if (file_info->ChangeTime) attrs.ia_ctime = ksmbd_NTtimeToUnix(file_info->ChangeTime); - ctime = attrs.ia_ctime; - attrs.ia_valid |= ATTR_CTIME; - } else { - ctime = inode->i_ctime; - } + else + attrs.ia_ctime = inode->i_ctime; if (file_info->LastWriteTime) { attrs.ia_mtime = ksmbd_NTtimeToUnix(file_info->LastWriteTime); @@ -5557,11 +5554,9 @@ static int set_file_basic_info(struct ksmbd_file *fp, return -EACCES; inode_lock(inode); + inode->i_ctime = attrs.ia_ctime; + attrs.ia_valid &= ~ATTR_CTIME; rc = notify_change(user_ns, dentry, &attrs, NULL); - if (!rc) { - inode->i_ctime = ctime; - mark_inode_dirty(inode); - } inode_unlock(inode); } return rc;