Unverified Commit 72d0e640 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12666 block: fix integer overflow in BLKSECDISCARD 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Qixing <zhengqixing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GET3R7XIJ7WBSP2D4E4U37JIQ3SVPXVX/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRAS 
 
Link:https://gitee.com/openeuler/kernel/pulls/12666

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 663f0264 7637aaaf

block/ioctl.c

+5 −4
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode, 
		return -EINVAL;



	filemap_invalidate_lock(inode->i_mapping);

	err = truncate_bdev_range(bdev, mode, start, start + len - 1);

	err = truncate_bdev_range(bdev, mode, start, end - 1);

	if (err)

		goto fail;

	err = blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
@@ -127,7 +127,7 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode, 
static int blk_ioctl_secure_erase(struct block_device *bdev, blk_mode_t mode,

		void __user *argp)

{

	uint64_t start, len;

	uint64_t start, len, end;

	uint64_t range[2];

	int err;
@@ -142,11 +142,12 @@ static int blk_ioctl_secure_erase(struct block_device *bdev, blk_mode_t mode, 
	len = range[1];

	if ((start & 511) || (len & 511))

		return -EINVAL;

	if (start + len > bdev_nr_bytes(bdev))

	if (check_add_overflow(start, len, &end) ||

	    end > bdev_nr_bytes(bdev))

		return -EINVAL;



	filemap_invalidate_lock(bdev->bd_inode->i_mapping);

	err = truncate_bdev_range(bdev, mode, start, start + len - 1);

	err = truncate_bdev_range(bdev, mode, start, end - 1);

	if (!err)

		err = blkdev_issue_secure_erase(bdev, start >> 9, len >> 9,

						GFP_KERNEL);