diff options
| author | Carlos Maiolino <cmaiolino@redhat.com> | 2020-01-09 14:30:44 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-02-03 14:05:57 +0100 |
| commit | 0d89fdae2afe833dd3025edd8c8287675d45c74e (patch) | |
| tree | cdcdf9ecea8586caa1cdb5c4b84fed59bad231c0 /fs/ioctl.c | |
| parent | ecryptfs: drop direct calls to ->bmap (diff) | |
| download | linux-0d89fdae2afe833dd3025edd8c8287675d45c74e.tar.xz linux-0d89fdae2afe833dd3025edd8c8287675d45c74e.zip | |
fibmap: Use bmap instead of ->bmap method in ioctl_fibmap
Now we have the possibility of proper error return in bmap, use bmap()
function in ioctl_fibmap() instead of calling ->bmap method directly.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ioctl.c')
| -rw-r--r-- | fs/ioctl.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index 2f5e4e5b97e1..13327862f278 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -54,19 +54,29 @@ EXPORT_SYMBOL(vfs_ioctl); static int ioctl_fibmap(struct file *filp, int __user *p) { - struct address_space *mapping = filp->f_mapping; - int res, block; + struct inode *inode = file_inode(filp); + int error, ur_block; + sector_t block; - /* do we support this mess? */ - if (!mapping->a_ops->bmap) - return -EINVAL; if (!capable(CAP_SYS_RAWIO)) return -EPERM; - res = get_user(block, p); - if (res) - return res; - res = mapping->a_ops->bmap(mapping, block); - return put_user(res, p); + + error = get_user(ur_block, p); + if (error) + return error; + + block = ur_block; + error = bmap(inode, &block); + + if (error) + ur_block = 0; + else + ur_block = block; + + if (put_user(ur_block, p)) + error = -EFAULT; + + return error; } /** |