| From 21b81dbd8e4c235223aab809abb32aeca165e4f3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 29 Sep 2020 11:54:38 +0300 |
| Subject: bus/fsl_mc: Do not rely on caller to provide non NULL mc_io |
| |
| From: Diana Craciun <diana.craciun@oss.nxp.com> |
| |
| [ Upstream commit 5026cf605143e764e1785bbf9158559d17f8d260 ] |
| |
| Before destroying the mc_io, check first that it was |
| allocated. |
| |
| Reviewed-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> |
| Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> |
| Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com> |
| Link: https://lore.kernel.org/r/20200929085441.17448-11-diana.craciun@oss.nxp.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/bus/fsl-mc/mc-io.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c |
| index a30b53f1d87d8..305015486b91c 100644 |
| --- a/drivers/bus/fsl-mc/mc-io.c |
| +++ b/drivers/bus/fsl-mc/mc-io.c |
| @@ -129,7 +129,12 @@ error_destroy_mc_io: |
| */ |
| void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) |
| { |
| - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; |
| + struct fsl_mc_device *dpmcp_dev; |
| + |
| + if (!mc_io) |
| + return; |
| + |
| + dpmcp_dev = mc_io->dpmcp_dev; |
| |
| if (dpmcp_dev) |
| fsl_mc_io_unset_dpmcp(mc_io); |
| -- |
| 2.27.0 |
| |