| From 014abe85dfb8749df5e34c022c0d861bcc9c1fef Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Jul 2021 18:07:49 +0200 |
| Subject: media: cxd2880-spi: Fix a null pointer dereference on error handling |
| path |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 11b982e950d2138e90bd120501df10a439006ff8 ] |
| |
| Currently the null pointer check on dvb_spi->vcc_supply is inverted and |
| this leads to only null values of the dvb_spi->vcc_supply being passed |
| to the call of regulator_disable causing null pointer dereferences. |
| Fix this by only calling regulator_disable if dvb_spi->vcc_supply is |
| not null. |
| |
| Addresses-Coverity: ("Dereference after null check") |
| |
| Fixes: dcb014582101 ("media: cxd2880-spi: Fix an error handling path") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Sean Young <sean@mess.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/spi/cxd2880-spi.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c |
| index 93194f03764d2..11273be702b6e 100644 |
| --- a/drivers/media/spi/cxd2880-spi.c |
| +++ b/drivers/media/spi/cxd2880-spi.c |
| @@ -618,7 +618,7 @@ fail_frontend: |
| fail_attach: |
| dvb_unregister_adapter(&dvb_spi->adapter); |
| fail_adapter: |
| - if (!dvb_spi->vcc_supply) |
| + if (dvb_spi->vcc_supply) |
| regulator_disable(dvb_spi->vcc_supply); |
| fail_regulator: |
| kfree(dvb_spi); |
| -- |
| 2.33.0 |
| |
