smb3: missing inode locks in punch hole
[ Upstream commit ba0803050d610d5072666be727bca5e03e55b242 ] smb3 fallocate punch hole was not grabbing the inode or filemap_invalidate locks so could have race with pagemap reinstantiating the page. Cc: stable@vger.kernel.org Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
59c6902a96
commit
e192a08f65
@ -3051,7 +3051,7 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon,
|
|||||||
static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
|
static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
|
||||||
loff_t offset, loff_t len)
|
loff_t offset, loff_t len)
|
||||||
{
|
{
|
||||||
struct inode *inode;
|
struct inode *inode = file_inode(file);
|
||||||
struct cifsFileInfo *cfile = file->private_data;
|
struct cifsFileInfo *cfile = file->private_data;
|
||||||
struct file_zero_data_information fsctl_buf;
|
struct file_zero_data_information fsctl_buf;
|
||||||
long rc;
|
long rc;
|
||||||
@ -3060,14 +3060,12 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
|
|||||||
|
|
||||||
xid = get_xid();
|
xid = get_xid();
|
||||||
|
|
||||||
inode = d_inode(cfile->dentry);
|
inode_lock(inode);
|
||||||
|
|
||||||
/* Need to make file sparse, if not already, before freeing range. */
|
/* Need to make file sparse, if not already, before freeing range. */
|
||||||
/* Consider adding equivalent for compressed since it could also work */
|
/* Consider adding equivalent for compressed since it could also work */
|
||||||
if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) {
|
if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) {
|
||||||
rc = -EOPNOTSUPP;
|
rc = -EOPNOTSUPP;
|
||||||
free_xid(xid);
|
goto out;
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -3086,6 +3084,8 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
|
|||||||
true /* is_fctl */, (char *)&fsctl_buf,
|
true /* is_fctl */, (char *)&fsctl_buf,
|
||||||
sizeof(struct file_zero_data_information),
|
sizeof(struct file_zero_data_information),
|
||||||
CIFSMaxBufSize, NULL, NULL);
|
CIFSMaxBufSize, NULL, NULL);
|
||||||
|
out:
|
||||||
|
inode_unlock(inode);
|
||||||
free_xid(xid);
|
free_xid(xid);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user