From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C45728ED for ; Mon, 12 Dec 2022 13:16:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EEC0C433D2; Mon, 12 Dec 2022 13:16:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1670850984; bh=htGyJovaI/yOeaKpQQYky5H+yllso7vaJDe9L3g85Ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ls8PA4SUjw2T+MVvpmnHpI5ZKNltxo1GU0/qS5sRSLsr6ZEAmotm2yz/HRAqvx+h6 KR6D3oeEk2yUWmixq+1eKtSg8i5MoI0KbTdcq1BQqIZNIx/6IRXz3qxXjOh/qoR9V0 syWDaVEcuw0C/agIBwPMsPGl+aGjy3lmr7zdnv54= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+c8ae65286134dd1b800d@syzkaller.appspotmail.com, Rob Clark , Daniel Vetter , Javier Martinez Canillas Subject: [PATCH 5.10 054/106] drm/shmem-helper: Remove errant put in error path Date: Mon, 12 Dec 2022 14:09:57 +0100 Message-Id: <20221212130927.219168385@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212130924.863767275@linuxfoundation.org> References: <20221212130924.863767275@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Rob Clark commit 24013314be6ee4ee456114a671e9fa3461323de8 upstream. drm_gem_shmem_mmap() doesn't own this reference, resulting in the GEM object getting prematurely freed leading to a later use-after-free. Link: https://syzkaller.appspot.com/bug?extid=c8ae65286134dd1b800d Reported-by: syzbot+c8ae65286134dd1b800d@syzkaller.appspotmail.com Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects") Cc: stable@vger.kernel.org Signed-off-by: Rob Clark Reviewed-by: Daniel Vetter Signed-off-by: Javier Martinez Canillas Link: https://patchwork.freedesktop.org/patch/msgid/20221130185748.357410-2-robdclark@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -616,10 +616,8 @@ int drm_gem_shmem_mmap(struct drm_gem_ob shmem = to_drm_gem_shmem_obj(obj); ret = drm_gem_shmem_get_pages(shmem); - if (ret) { - drm_gem_vm_close(vma); + if (ret) return ret; - } vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);