Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd19e44b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs
Browse files

drm/nouveau: move dereferences after null checks 



Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarMaarten Maathuis <madman2003@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b1d37aa0

drivers/gpu/drm/nouveau/nouveau_connector.c

+4 −3
Original line number Diff line number Diff line
@@ -88,13 +88,14 @@ nouveau_connector_destroy(struct drm_connector *drm_connector) 
{

	struct nouveau_connector *nv_connector =

		nouveau_connector(drm_connector);

	struct drm_device *dev = nv_connector->base.dev;



	NV_DEBUG_KMS(dev, "\n");

	struct drm_device *dev;



	if (!nv_connector)

		return;



	dev = nv_connector->base.dev;

	NV_DEBUG_KMS(dev, "\n");



	kfree(nv_connector->edid);

	drm_sysfs_connector_remove(drm_connector);

	drm_connector_cleanup(drm_connector);

drivers/gpu/drm/nouveau/nouveau_object.c

+2 −1
Original line number Diff line number Diff line
@@ -885,11 +885,12 @@ int 
nouveau_gpuobj_sw_new(struct nouveau_channel *chan, int class,

		      struct nouveau_gpuobj **gpuobj_ret)

{

	struct drm_nouveau_private *dev_priv = chan->dev->dev_private;

	struct drm_nouveau_private *dev_priv;

	struct nouveau_gpuobj *gpuobj;



	if (!chan || !gpuobj_ret || *gpuobj_ret != NULL)

		return -EINVAL;

	dev_priv = chan->dev->dev_private;



	gpuobj = kzalloc(sizeof(*gpuobj), GFP_KERNEL);

	if (!gpuobj)

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+4 −3
Original line number Diff line number Diff line
@@ -54,11 +54,12 @@ static void 
nouveau_sgdma_clear(struct ttm_backend *be)

{

	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be;

	struct drm_device *dev = nvbe->dev;



	NV_DEBUG(nvbe->dev, "\n");

	struct drm_device *dev;



	if (nvbe && nvbe->pages) {

		dev = nvbe->dev;

		NV_DEBUG(dev, "\n");



		if (nvbe->bound)

			be->func->unbind(be);

drivers/gpu/drm/nouveau/nv50_crtc.c

+7 −4
Original line number Diff line number Diff line
@@ -298,14 +298,17 @@ nv50_crtc_set_clock(struct drm_device *dev, int head, int pclk) 
static void

nv50_crtc_destroy(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);



	NV_DEBUG_KMS(dev, "\n");

	struct drm_device *dev;

	struct nouveau_crtc *nv_crtc;



	if (!crtc)

		return;



	dev = crtc->dev;

	nv_crtc = nouveau_crtc(crtc);



	NV_DEBUG_KMS(dev, "\n");



	drm_crtc_cleanup(&nv_crtc->base);



	nv50_cursor_fini(nv_crtc);