On Thu, Oct 24, 2019 at 02:38:53PM +0200, Daniel Vetter wrote: > On Thu, Oct 24, 2019 at 11:48:01AM +0100, Colin King wrote: > > From: Colin Ian King <colin.king@xxxxxxxxxxxxx> > > > > Two different fixes have addressed the same memory leak of bin and > > this now causes a double free of bin. While the individual memory > > leak fixes are fine, both fixes together are problematic. > > > > Addresses-Coverity: ("Double free") > > Fixes: 29cd13cfd762 ("drm/v3d: Fix memory leak in v3d_submit_cl_ioctl") > > Fixes: 0d352a3a8a1f (" rm/v3d: don't leak bin job if v3d_job_init fails.") > > Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx> > > That sounds like wrong merge resolution somewhere, and we don't have those > patches merged together in any final tree yet anywhere. What's this based > on? > -Daniel linux-next. I sent this fix to you and Stephen Rothwell yesterday so this one is sorted already. Stephen will apply my patch until you guys merge your drm trees. regards, dan carpenter