diff options
Diffstat (limited to 'drivers/misc/pci_endpoint_test.c')
| -rw-r--r-- | drivers/misc/pci_endpoint_test.c | 34 | 
1 files changed, 28 insertions, 6 deletions
diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index 8f786a225dcf..11530b4ec389 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -332,6 +332,22 @@ static bool pci_endpoint_test_msi_irq(struct pci_endpoint_test *test,  	return false;  } +static int pci_endpoint_test_validate_xfer_params(struct device *dev, +		struct pci_endpoint_test_xfer_param *param, size_t alignment) +{ +	if (!param->size) { +		dev_dbg(dev, "Data size is zero\n"); +		return -EINVAL; +	} + +	if (param->size > SIZE_MAX - alignment) { +		dev_dbg(dev, "Maximum transfer data size exceeded\n"); +		return -EINVAL; +	} + +	return 0; +} +  static bool pci_endpoint_test_copy(struct pci_endpoint_test *test,  				   unsigned long arg)  { @@ -363,9 +379,11 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test,  		return false;  	} +	err = pci_endpoint_test_validate_xfer_params(dev, ¶m, alignment); +	if (err) +		return false; +  	size = param.size; -	if (size > SIZE_MAX - alignment) -		goto err;  	use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);  	if (use_dma) @@ -497,9 +515,11 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test,  		return false;  	} +	err = pci_endpoint_test_validate_xfer_params(dev, ¶m, alignment); +	if (err) +		return false; +  	size = param.size; -	if (size > SIZE_MAX - alignment) -		goto err;  	use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);  	if (use_dma) @@ -595,9 +615,11 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test,  		return false;  	} +	err = pci_endpoint_test_validate_xfer_params(dev, ¶m, alignment); +	if (err) +		return false; +  	size = param.size; -	if (size > SIZE_MAX - alignment) -		goto err;  	use_dma = !!(param.flags & PCITEST_FLAGS_USE_DMA);  	if (use_dma)  |