From patchwork Thu Oct 15 07:36:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403601 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6E213BEEA4 for ; Thu, 15 Oct 2015 07:34:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95241207EB for ; Thu, 15 Oct 2015 07:34:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CF5E520786 for ; Thu, 15 Oct 2015 07:34:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE7C27A116; Thu, 15 Oct 2015 00:34:18 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F5117A0E8 for ; Thu, 15 Oct 2015 00:34:10 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so259845379wic.1 for ; Thu, 15 Oct 2015 00:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wvOp77spLrwPaglYuASDWC9E5QQyy/2pldWqIakUb7I=; b=UWtGW6mcVzur8ob5qjmf/ubMpErVRfLSOhD7oELBtRMbtNkmEl4hxXtv62B95jjQfO NANWzARMbNHbxynlCC/6mBn1rwNO1e8JgNvfAzMXoxgIUDvKD+7ohee+NhTBy+0Yy74k JIjLLFAYK/Ya+gWN43TslZnxqvgwgEZE9puaA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wvOp77spLrwPaglYuASDWC9E5QQyy/2pldWqIakUb7I=; b=A6WOTAMr9gbAMbTrZiTATe8Dq4bwSC1JR0LDXDtGr1VXGlpL+qNdhJnTvLVzABTWpI H6wfF3kqIybQLTprc/fPcrZMQ8bTrIgbE+X+YXUZOCxHl0gHG+LYl7Ebq+9BWdyHNNeP vE+vonu+4omDA8idBJxL/95ml/Ugb6/IIDpVlCiUhmPf2HvdNXqMoFJHE36YTrmfFW0A F9zWTARMnyDGHk3mVhxOgOryHlGeLztdYXnWun1zAKkPR7swctwOfLqKwPWc3HVw7VG1 +TczmHxKHgucNJ0aFRr2fFg+uPp5wNtQ+KKylhFVmxtUp2+n9JN11qjVqRsqiwTfsHc6 pLIQ== X-Gm-Message-State: ALoCoQkxsC6f9Dc/X1ACWuNeflofRQcni/T3IFE68LbOa7bV5miu2DN2j04dPM4G3i4ICsNMx4H/ X-Received: by 10.194.112.104 with SMTP id ip8mr10209293wjb.85.1444894449107; Thu, 15 Oct 2015 00:34:09 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id z4sm10201014wjz.29.2015.10.15.00.34.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:34:08 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 19/25] drm/exynos: Drop dev->struct_mutex from mmap offset function Date: Thu, 15 Oct 2015 09:36:35 +0200 Message-Id: <1444894601-5200-20-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simply forgotten about this when I was doing my general cleansing of simple gem mmap offset functions. There's nothing but core functions called here, and they all have their own protection already. Aside: DRM_ERROR for userspace controlled input isn't great, but that's for another patch. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 407afedb6003..f6c7bc3a7e68 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -437,8 +437,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv, struct drm_gem_object *obj; int ret = 0; - mutex_lock(&dev->struct_mutex); - /* * get offset of memory allocated for drm framebuffer. * - this callback would be called by user application @@ -448,16 +446,13 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv, obj = drm_gem_object_lookup(dev, file_priv, handle); if (!obj) { DRM_ERROR("failed to lookup gem object.\n"); - ret = -EINVAL; - goto unlock; + return -EINVAL; } *offset = drm_vma_node_offset_addr(&obj->vma_node); DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset); drm_gem_object_unreference(obj); -unlock: - mutex_unlock(&dev->struct_mutex); return ret; }