Merge tag 'spi-fix-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[thirdparty/kernel/linux.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 0c76137adcaaa5b9d212d789291d681c23c064f6..a9028a2c2db57b0881b7faf7cee2243148d1626c 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -96,7 +96,7 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
                unsigned long arg)
 {
        uint64_t range[2];
-       uint64_t start, len;
+       uint64_t start, len, end;
        struct inode *inode = bdev->bd_inode;
        int err;
 
@@ -117,7 +117,8 @@ static int blk_ioctl_discard(struct block_device *bdev, blk_mode_t mode,
        if (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(inode->i_mapping);