]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/msm: fix leaks if initialization fails
authorPavel Machek <pavel@denx.de>
Mon, 9 Mar 2020 10:14:10 +0000 (11:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:14:38 +0000 (13:14 +0200)
[ Upstream commit 66be340f827554cb1c8a1ed7dea97920b4085af2 ]

We should free resources in unlikely case of allocation failure.

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/msm_drv.c

index 7f45486b6650b9715579fd36fc304292b7ec2890..3ba3ae9749bece2929d6812e590560c598be4de9 100644 (file)
@@ -495,8 +495,10 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
        if (!dev->dma_parms) {
                dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
                                              GFP_KERNEL);
-               if (!dev->dma_parms)
-                       return -ENOMEM;
+               if (!dev->dma_parms) {
+                       ret = -ENOMEM;
+                       goto err_msm_uninit;
+               }
        }
        dma_set_max_seg_size(dev, DMA_BIT_MASK(32));