| Message ID | 20200315194239.28785-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 66be340f827554cb1c8a1ed7dea97920b4085af2 |
| Headers | show |
| Series | drm/msm: Fix an error handling path 'msm_drm_init()' | expand |
Hi, On Sun, Mar 15, 2020 at 12:42 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > If this memory allocation fails, we have to go through the error handling > path to perform some clean-up, as already done in other other paths of > this function. > > Fixes: db735fc4036b ("drm/msm: Set dma maximum segment size for mdss") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/gpu/drm/msm/msm_drv.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) This has already been posted as: https://lore.kernel.org/r/20200309101410.GA18031@duo.ucw.cz
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 2a82c23a6e4d..29295dee2a2e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -444,8 +444,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));
If this memory allocation fails, we have to go through the error handling path to perform some clean-up, as already done in other other paths of this function. Fixes: db735fc4036b ("drm/msm: Set dma maximum segment size for mdss") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/gpu/drm/msm/msm_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)