Skip to contentSkip to conversation

drm/v3d: Fix double free in gem code

PATCH New Nicolas Saenz Julienne 1 participant 1 message Jul 16, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/v3d: Fix double free in gem code

These two patches fix the same issue:

- drm/v3d: Fix memory leak in v3d_submit_cl_ioctl (29cd13cfd76)
- drm/v3d: don't leak bin job if v3d_job_init fails (0d352a3a8a1)

And it seems that the conflict was missed during the merge.

Get rid of one of the free() calls.

Fixes 77e0723bd27f ("Merge v5.4-rc7 into drm-next")
---
 drivers/gpu/drm/v3d/v3d_gem.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/v3d/v3d_gem.c +0 -1
index 915f8bfdb58c..3cfbdb8e6a91 100644
@@ -570,7 +570,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
 		if (ret) {
 			kfree(bin);
 			v3d_job_put(&render->base);
-			kfree(bin);
 			return ret;
 		}
 
Signature · 1 line
2.27.0