From patchwork Tue Jun 13 23:15:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 9785091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E609E60384 for ; Wed, 14 Jun 2017 00:43:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D903C28567 for ; Wed, 14 Jun 2017 00:43:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDB4E28573; Wed, 14 Jun 2017 00:43:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C19F28567 for ; Wed, 14 Jun 2017 00:43:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B9DB6E3EA; Wed, 14 Jun 2017 00:41:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0D0D6E3B4 for ; Tue, 13 Jun 2017 23:38:44 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id o28so14872685lfk.1 for ; Tue, 13 Jun 2017 16:38:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=/1Ai3F1hGUI+rshgJJnzFcUYBNazYiXKBIZhiZeM9+I=; b=iBuDKpHEUCOx0KLbHPLfFHKs0acjEKG2xRXBys6sV/WSNarkSzwXW0iDd0SiPtRBXX 7w9ycm8gkfl1fq2am1CPxNPZbPyd3OjA/qlFXhdP6jhl9v+Ko53o20T7jIJxHAnd825I 9WUSG/XLB1G7Wr9g5rr0eaKrzm854zyEEFIMb8AAH1xeDmg57i7iI+ICy4JZlV3jSYpW MZXhfuyU0fXMOMi4BTJyqb/Ca56f/DfktrYgOAZJB1YKf481+oXQtAAiEt7MflBUvcyM iQRXaEYqemsPFq4pih3jrXp3ANgILKqHlro5//btEnVrekZ3q2bxirtkyfeO21nf/1z1 QXWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=/1Ai3F1hGUI+rshgJJnzFcUYBNazYiXKBIZhiZeM9+I=; b=cF1YXl1KiArBMeT2Kv8xgZaGCJwi89hDguy/sg7r64G4J8Nmi/FHW/T/zI3s8O37yb RQy2nq9wiCVVR8U3SRAGi1FprqzVT6oNd5D++PMQ8jFCTymoxCgkQN4owBirYnp3bqfI KZsOfO52WIsYie+TgVrANcbwNI8L8hl3SpKhtO7iNjLVS7T7nemv8tTbae9ZqTg+95E2 ND/wAikes3IPTq7ApqEZQEUqaUCVe7k6ILUWLJNtohUxnctiLw3fPa64ENR1QZKzZ0dL G1PMj44MLxHQ5tfolrp41eUjC40F9DtDRqKC6T8NJzA7qCUwlVE+ZJCbYi5nLw0uP2qw fcrg== X-Gm-Message-State: AKS2vOzsoIbqJIF5Z63mK0jOU99WnvROHB13BKaY/jt4HOuHZXlNDRmg y3t8R3h4UOF3vg== X-Received: by 10.46.71.129 with SMTP id u123mr724564lja.115.1497397123187; Tue, 13 Jun 2017 16:38:43 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-7.pppoe.spdop.ru. [109.252.91.7]) by smtp.gmail.com with ESMTPSA id f27sm3785725lfa.27.2017.06.13.16.38.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 16:38:42 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Mikko Perttunen , Erik Faye-Lund Subject: [PATCH v2 01/22] drm/tegra: Fix lockup on a use of staging API Date: Wed, 14 Jun 2017 02:15:40 +0300 Message-Id: X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-Mailman-Approved-At: Wed, 14 Jun 2017 00:40:59 +0000 Cc: linux-tegra@vger.kernel.org, DRI Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit bdd2f9cd ("Don't leak kernel pointer to userspace") added a mutex around staging IOCTL's, some of those mutexes are taken twice. Fixes: bdd2f9cd10eb ("drm/tegra: Don't leak kernel pointer to userspace") Signed-off-by: Dmitry Osipenko Reviewed-by: Mikko Perttunen Reviewed-by: Erik Faye-Lund --- drivers/gpu/drm/tegra/drm.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 51c48a8e00ec..b49d32a89f40 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -451,18 +451,6 @@ int tegra_drm_submit(struct tegra_drm_context *context, #ifdef CONFIG_DRM_TEGRA_STAGING -static struct tegra_drm_context * -tegra_drm_file_get_context(struct tegra_drm_file *file, u32 id) -{ - struct tegra_drm_context *context; - - mutex_lock(&file->lock); - context = idr_find(&file->contexts, id); - mutex_unlock(&file->lock); - - return context; -} - static int tegra_gem_create(struct drm_device *drm, void *data, struct drm_file *file) { @@ -606,7 +594,7 @@ static int tegra_close_channel(struct drm_device *drm, void *data, mutex_lock(&fpriv->lock); - context = tegra_drm_file_get_context(fpriv, args->context); + context = idr_find(&fpriv->contexts, args->context); if (!context) { err = -EINVAL; goto unlock; @@ -631,7 +619,7 @@ static int tegra_get_syncpt(struct drm_device *drm, void *data, mutex_lock(&fpriv->lock); - context = tegra_drm_file_get_context(fpriv, args->context); + context = idr_find(&fpriv->contexts, args->context); if (!context) { err = -ENODEV; goto unlock; @@ -660,7 +648,7 @@ static int tegra_submit(struct drm_device *drm, void *data, mutex_lock(&fpriv->lock); - context = tegra_drm_file_get_context(fpriv, args->context); + context = idr_find(&fpriv->contexts, args->context); if (!context) { err = -ENODEV; goto unlock; @@ -685,7 +673,7 @@ static int tegra_get_syncpt_base(struct drm_device *drm, void *data, mutex_lock(&fpriv->lock); - context = tegra_drm_file_get_context(fpriv, args->context); + context = idr_find(&fpriv->contexts, args->context); if (!context) { err = -ENODEV; goto unlock;