Message ID | 20200116231715.550710759@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=dSN7=3F=vger.kernel.org=stable-owner@kernel.org> 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 8C538C33CAF for <stable@archiver.kernel.org>; Thu, 16 Jan 2020 23:39:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5286B20748 for <stable@archiver.kernel.org>; Thu, 16 Jan 2020 23:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217988; bh=BthoY7cBT+8JYlgXSawoQEjQkU4RYH/k7PQnhlSHTLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t6XUwtT0FEe9L9gn9TqOFxMw7AkyiabucMvh1WXdZZB2QmVmIdCOtkSvRrwHJUM+I L1kTMMDOLxq1LOvJZ/JCfRNWtVDRHe6T2viij9IOlsauidECo8cRz7bNKdQdusCPG3 vFF0hd1Evwx9BbrWN1DYMxAwyotSV7ege1rkgAA0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390365AbgAPX14 (ORCPT <rfc822;stable@archiver.kernel.org>); Thu, 16 Jan 2020 18:27:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:60210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390363AbgAPX1z (ORCPT <rfc822;stable@vger.kernel.org>); Thu, 16 Jan 2020 18:27:55 -0500 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 147EC20684; Thu, 16 Jan 2020 23:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217274; bh=BthoY7cBT+8JYlgXSawoQEjQkU4RYH/k7PQnhlSHTLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rw40zoDW3TumsWjPPZlFu5zWhW4ni6tb/gV/4fekUxHA2dzmKqW+7X/vYU4IwCZBZ 80k/tA2hxze4P8r++g7WYHrf7LavwhEEiLuiGLzb37Sr467H4eZ2KHmQ/z+miQ0RdN XCVhu300kQd/zkCQ2lQPyH+pyKgtXTJk++h1afvc= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, =?utf-8?b?572X5p2D?= <luoquan@qianxin.com>, Chris Wilson <chris@chris-wilson.co.uk>, Jon Bloomfield <jon.bloomfield@intel.com>, Tyler Hicks <tyhicks@canonical.com> Subject: [PATCH 4.19 16/84] drm/i915: Fix use-after-free when destroying GEM context Date: Fri, 17 Jan 2020 00:17:50 +0100 Message-Id: <20200116231715.550710759@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -770,18 +770,19 @@ int i915_gem_context_destroy_ioctl(struc if (args->ctx_id == DEFAULT_CONTEXT_HANDLE) return -ENOENT; + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return ret; + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); - if (!ctx) + if (!ctx) { + mutex_unlock(&dev->struct_mutex); return -ENOENT; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - goto out; + } __destroy_hw_context(ctx, file_priv); mutex_unlock(&dev->struct_mutex); -out: i915_gem_context_put(ctx); return 0; }