From patchwork Wed Oct 26 22:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 13021325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A11ADC38A2D for ; Wed, 26 Oct 2022 22:47:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22E0810E5AF; Wed, 26 Oct 2022 22:47:39 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 194FD10E5AB for ; Wed, 26 Oct 2022 22:47:23 +0000 (UTC) Received: from dimapc.. (109-252-112-196.nat.spd-mgts.ru [109.252.112.196]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id A74CB66028B0; Wed, 26 Oct 2022 23:47:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1666824441; bh=6QiRYUSIMrwPPW/bBvP2JzfoL5s94stAk7lsEZE9m8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FxHJGJrXr3g7J0J0RfrP4JFa3nf0DcPezfn4+8uA+S1ghQJkSPIgCGWeSfQj2nYQ5 JteVO3aWq8EK78cA3C2H9IKn5y3f+biO5ugA3yV6zqc976O+uzJEWaxxXo9zSlRbHY qpnaRMgGJ8RVu8iKcErs8ZXZjcuzdVjOKLRI6UrdtQCYUvmL4cDQb4LHR7TY6kbrOn s1Qzkg4NpCasK0MI2cO7jirXKaZRQCnbNzD1H9vFBAYe7akc7zKzBndF7ER9yMNaVu xLcCOMfL7LuBqXOwamj/BEpoxXF4nOXQru2umqRKw4t0wxANEL4+LZc2lIu0sk8Qgb It/Hk6J8WUfyA== From: Dmitry Osipenko To: Maarten Lankhorst , Maxime Ripard , Sumit Semwal , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , noralf@tronnes.org, Dan Carpenter Subject: [PATCH v1 1/2] dma-buf: Make locking consistent in dma_buf_detach() Date: Thu, 27 Oct 2022 01:46:39 +0300 Message-Id: <20221026224640.7542-2-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026224640.7542-1-dmitry.osipenko@collabora.com> References: <20221026224640.7542-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The dma_buf_detach() locks attach->dmabuf->resv and then unlocks dmabuf->resv, which could be a two different locks from a static code checker perspective. In particular this triggers Smatch to report the "double unlock" error. Make the locking pointers consistent. Reported-by: Dan Carpenter Link: https://lore.kernel.org/dri-devel/Y1fLfsccW3AS%2Fo+%2F@kili/ Fixes: 809d9c72c2f8 ("dma-buf: Move dma_buf_attach() to dynamic locking specification") Signed-off-by: Dmitry Osipenko --- drivers/dma-buf/dma-buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index c40d72d318fd..6e33ef4fde34 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -998,9 +998,10 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach) if (WARN_ON(!dmabuf || !attach)) return; - dma_resv_lock(attach->dmabuf->resv, NULL); + dma_resv_lock(dmabuf->resv, NULL); if (attach->sgt) { + WARN_ON(dmabuf != attach->dmabuf); __unmap_dma_buf(attach, attach->sgt, attach->dir); From patchwork Wed Oct 26 22:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 13021324 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD814C38A2D for ; Wed, 26 Oct 2022 22:47:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05CA310E5AC; Wed, 26 Oct 2022 22:47:39 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD16B10E5AC for ; Wed, 26 Oct 2022 22:47:23 +0000 (UTC) Received: from dimapc.. (109-252-112-196.nat.spd-mgts.ru [109.252.112.196]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id B449C66028B1; Wed, 26 Oct 2022 23:47:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1666824442; bh=1PIO06hn7jCRpnGP0u+Jtd9+O0JPNXdkS3SYQoY8CMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SqNESA2fcICoaDUbmdf5nDit5oNiPedlCm15j7wjtZAE/3+DUBjfnbL73vcx/eEU5 eFj1ZJ/KvxMyF1SZsTcOPw0mo15AFs3pMncShRhhR/oJwsFn61AvPHHg3AxCZ8wiLX 6QnMb1rz1B5nXO6GLajXChPmIZA2InFfx1zDeCigGMlI12c+IvqLpCaa4B4M944DYb Hoc6Ml+tXAnDOXOF20hDjKWzBPXAekYgqoD/c2Ct2uI6T5QaxuPsUzSCGIseNXoKJF dOIhgKd1zvMVMUUprVNhanMOfV2dbbaS7Q4jsbj00Md5VXmOMvNwVHEphZzH2AHUaZ Tot9HZllpEOUQ== From: Dmitry Osipenko To: Maarten Lankhorst , Maxime Ripard , Sumit Semwal , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , noralf@tronnes.org, Dan Carpenter Subject: [PATCH v1 2/2] drm/gem: Check whether object is NULL in drm_gem_vunmap() Date: Thu, 27 Oct 2022 01:46:40 +0300 Message-Id: <20221026224640.7542-3-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221026224640.7542-1-dmitry.osipenko@collabora.com> References: <20221026224640.7542-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_gem_vunmap() will crash with a NULL dereference if the passed object pointer is NULL. It wasn't a problem before we added the locking support to drm_gem_vunmap function because the mapping argument was always NULL together with the object. Make drm_gem_vunmap() functions to handle the NULL pointers better. Reported-by: Dan Carpenter Link: https://lore.kernel.org/dri-devel/Y1kFEGxT8MVlf32V@kili/ Fixes: 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations") Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index b8db675e7fb5..ee0a246ff4ac 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1175,11 +1175,11 @@ EXPORT_SYMBOL(drm_gem_vmap); void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map) { - dma_resv_assert_held(obj->resv); - - if (iosys_map_is_null(map)) + if (!obj || iosys_map_is_null(map)) return; + dma_resv_assert_held(obj->resv); + if (obj->funcs->vunmap) obj->funcs->vunmap(obj, map); @@ -1202,6 +1202,9 @@ EXPORT_SYMBOL(drm_gem_vmap_unlocked); void drm_gem_vunmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map) { + if (!obj || iosys_map_is_null(map)) + return; + dma_resv_lock(obj->resv, NULL); drm_gem_vunmap(obj, map); dma_resv_unlock(obj->resv);