]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
spi: loopback-test: Fix kfree() NULL pointer error.
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Tue, 20 Jun 2017 09:30:53 +0000 (15:00 +0530)
committerMark Brown <broonie@kernel.org>
Wed, 28 Jun 2017 19:16:41 +0000 (20:16 +0100)
Here, rx/tx allocation can fail. So avoid kvfree call
with NULL pointer.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-loopback-test.c

index 514997a143dca6aad2bac723425c405eb40330ea..3459965004f86f387156ce8aa9a513cdd9c3b5f6 100644 (file)
@@ -1021,10 +1021,9 @@ int spi_test_run_tests(struct spi_device *spi,
                rx = vmalloc(SPI_TEST_MAX_SIZE_PLUS);
        else
                rx = kzalloc(SPI_TEST_MAX_SIZE_PLUS, GFP_KERNEL);
-       if (!rx) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!rx)
+               return -ENOMEM;
+
 
        if (use_vmalloc)
                tx = vmalloc(SPI_TEST_MAX_SIZE_PLUS);
@@ -1032,7 +1031,7 @@ int spi_test_run_tests(struct spi_device *spi,
                tx = kzalloc(SPI_TEST_MAX_SIZE_PLUS, GFP_KERNEL);
        if (!tx) {
                ret = -ENOMEM;
-               goto out;
+               goto err_tx;
        }
 
        /* now run the individual tests in the table */
@@ -1057,8 +1056,9 @@ int spi_test_run_tests(struct spi_device *spi,
        }
 
 out:
-       kvfree(rx);
        kvfree(tx);
+err_tx:
+       kvfree(rx);
        return ret;
 }
 EXPORT_SYMBOL_GPL(spi_test_run_tests);