bus/fsl_mc: Do not rely on caller to provide non NULL mc_io
authorDiana Craciun <diana.craciun@oss.nxp.com>
Tue, 29 Sep 2020 08:54:38 +0000 (11:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Nov 2020 09:23:54 +0000 (10:23 +0100)
[ 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/staging/fsl-mc/bus/mc-io.c

index 798c965fe2033da18de82686e76492d4bec69736..3fa6774946fae18a9c45140921454831cbd53c2e 100644 (file)
@@ -167,7 +167,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);