From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 292D5C43381 for ; Mon, 1 Apr 2019 18:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEC1320663 for ; Mon, 1 Apr 2019 18:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554142135; bh=V741NWuR+dXVn68iXKtz/7Rj5CxqdJU6VmbF2uCSx7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QCP9pEBaMKTZUXr3pZMlEMT6Q/Y3t6B07wJWM135j50J7f3bP3CdedsuzOkdb8PmT 1Q0F16cEZunHT0flkDESm473KJX0x3jJjnonjvV8sbERj2FMHwm1z1P3XooAeCNICM j8sm1Vjw/A4Foq5gPU1c9GqYoFfSkzow4YC6maxY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729482AbfDARJj (ORCPT ); Mon, 1 Apr 2019 13:09:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:56700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729170AbfDARJi (ORCPT ); Mon, 1 Apr 2019 13:09:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 626242192D; Mon, 1 Apr 2019 17:09:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138577; bh=V741NWuR+dXVn68iXKtz/7Rj5CxqdJU6VmbF2uCSx7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dwe9Pb1ikFKEFVX5LIBnWm54UC7rTmYdOU0X8zZcBmg8IJJ0U7a+JF7X40fKQMswi HwRy26YOC6ExWj4qhgxES4fapyZuAg9kg1aSFDAj9HCdUKJ57RCM1DS1Mi2RSnstrz ozaNfh3kAGhf8GPf2hmdMobJobksLzJq+joqnxFU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rodrigo Siqueira , Haneen Mohammed , Daniel Vetter , Chris Wilson , Eric Biggers , Maxime Ripard Subject: [PATCH 5.0 107/146] drm/vkms: fix use-after-free when drm_gem_handle_create() fails Date: Mon, 1 Apr 2019 19:01:59 +0200 Message-Id: <20190401170057.644053531@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170048.449559024@linuxfoundation.org> References: <20190401170048.449559024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 36b6c9ed45afe89045973e8dee1b004dd5372d40 upstream. If drm_gem_handle_create() fails in vkms_gem_create(), then the vkms_gem_object is freed twice: once when the reference is dropped by drm_gem_object_put_unlocked(), and again by the extra calls to drm_gem_object_release() and kfree(). Fix it by skipping the second release and free. This bug was originally found in the vgem driver by syzkaller using fault injection, but I noticed it's also present in the vkms driver. Fixes: 559e50fd34d1 ("drm/vkms: Add dumb operations") Cc: Rodrigo Siqueira Cc: Haneen Mohammed Cc: Daniel Vetter Cc: Chris Wilson Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Reviewed-by: Chris Wilson Reviewed-by: Rodrigo Siqueira Signed-off-by: Rodrigo Siqueira Link: https://patchwork.freedesktop.org/patch/msgid/20190226220858.214438-1-ebiggers@kernel.org Signed-off-by: Maxime Ripard Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vkms/vkms_gem.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/gpu/drm/vkms/vkms_gem.c +++ b/drivers/gpu/drm/vkms/vkms_gem.c @@ -111,11 +111,8 @@ struct drm_gem_object *vkms_gem_create(s ret = drm_gem_handle_create(file, &obj->gem, handle); drm_gem_object_put_unlocked(&obj->gem); - if (ret) { - drm_gem_object_release(&obj->gem); - kfree(obj); + if (ret) return ERR_PTR(ret); - } return &obj->gem; }