diff options
| -rw-r--r-- | block/blk-integrity.c | 10 | ||||
| -rw-r--r-- | block/ioctl.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 9d9dc9c32083..61a79e19c78f 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -62,10 +62,12 @@ int blk_get_meta_cap(struct block_device *bdev, unsigned int cmd, struct logical_block_metadata_cap meta_cap = {}; size_t usize = _IOC_SIZE(cmd); - if (!argp) - return -EINVAL; - if (usize < LBMD_SIZE_VER0) - return -EINVAL; + if (_IOC_DIR(cmd) != _IOC_DIR(FS_IOC_GETLBMD_CAP) || + _IOC_TYPE(cmd) != _IOC_TYPE(FS_IOC_GETLBMD_CAP) || + _IOC_NR(cmd) != _IOC_NR(FS_IOC_GETLBMD_CAP) || + _IOC_SIZE(cmd) < LBMD_SIZE_VER0) + return -ENOIOCTLCMD; + if (!bi) goto out; diff --git a/block/ioctl.c b/block/ioctl.c index 9ad403733e19..af2e22e5533c 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -566,9 +566,11 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode, void __user *argp) { unsigned int max_sectors; + int ret; - if (_IOC_NR(cmd) == _IOC_NR(FS_IOC_GETLBMD_CAP)) - return blk_get_meta_cap(bdev, cmd, argp); + ret = blk_get_meta_cap(bdev, cmd, argp); + if (ret != -ENOIOCTLCMD) + return ret; switch (cmd) { case BLKFLSBUF: |