]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
misc: pci_endpoint_test: Prevent some integer overflows
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 30 Sep 2017 08:15:52 +0000 (11:15 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Oct 2017 08:39:28 +0000 (10:39 +0200)
"size + max" can have an arithmetic overflow when we're allocating:

orig_src_addr = dma_alloc_coherent(dev, size + alignment, ...

I've added a few checks to prevent that.

Fixes: 13107c60681f ("misc: pci_endpoint_test: Add support to provide aligned buffer addresses")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/pci_endpoint_test.c

index deb20302649652d157529b82570dc45d913160c6..c0d323077ad0deebe78f21fd3738d4d6a005df95 100644 (file)
@@ -226,6 +226,9 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size)
        u32 src_crc32;
        u32 dst_crc32;
 
+       if (size > SIZE_MAX - alignment)
+               goto err;
+
        orig_src_addr = dma_alloc_coherent(dev, size + alignment,
                                           &orig_src_phys_addr, GFP_KERNEL);
        if (!orig_src_addr) {
@@ -311,6 +314,9 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, size_t size)
        size_t alignment = test->alignment;
        u32 crc32;
 
+       if (size > SIZE_MAX - alignment)
+               goto err;
+
        orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr,
                                       GFP_KERNEL);
        if (!orig_addr) {
@@ -369,6 +375,9 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, size_t size)
        size_t alignment = test->alignment;
        u32 crc32;
 
+       if (size > SIZE_MAX - alignment)
+               goto err;
+
        orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr,
                                       GFP_KERNEL);
        if (!orig_addr) {