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: 11463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp520450wru; Wed, 26 Oct 2022 15:48:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM419sAfxdF5E73N4DwFKW/F0SNbpceMgfJmyAj18VI2AYJpo/DSODCPhvFUyvdIvF+4kgWt X-Received: by 2002:a17:90b:19ca:b0:212:d2c4:83ac with SMTP id nm10-20020a17090b19ca00b00212d2c483acmr6687494pjb.166.1666824527255; Wed, 26 Oct 2022 15:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666824527; cv=none; d=google.com; s=arc-20160816; b=waE94N+PlehC8JmBk7A2ZCoT5Ma1Reh8RplLv5spamAUk4ElI8v51J+6iXCd1nAY2E o1DoZhveffJ9JhNG20aAkj4l62cVv0/Kkn5giFEO/42QAXBQwDydfwl8SyvD7jrXi37t BvDINgW0D+oXg873FuDG3sGF1adc838z6HJcjL3SeqKD0f33EKVe6v+f7RFJusPPp3hO WiMVz8Nk34nFqUTvepDSiaou4I/K1KRuWRmEmQY77T3jZitefgKHoX3u5nqumQM+fx/Z Q5YJ2TnUXvme/6TC2PJsHX/Z+ga3PzHiWBgCKHnruAFd7CafnZhvmakxnSefqMQ7SJzl R/CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7o6WqWihuUpukhhS6xCQA92HMp+JgEP6doMJ70USxY0=; b=Zn5Ysqa6TLfSaWvjZDbkDoqCf+QjvQO9dQUuUIBRfOmPPkRDnJE7C426Cuhgb4YA+k d0q4IDn2OFKyjGPXbcgXUwcnAgOTG6CQCSOhWfrzxeMij/545DMxSJKlQkTsUDG78bTP +TuqhS59mIV2rEmshIDhAfw9GoGICnVbzUm+v74vdLIFEkeETqm0tF/mb8MuFiH9g9gC yPBztS+u3uXstg0XGyzE1By6GyinG8LpXXTLAGVsysza2TaGm19sCwLU9y/7PDLdMFJF U3J48G+ot27Pqr1eFWJ89bOhWEZLdSk6X1zamFCSBJqh/WOvv2/Pa4+7i6elWIBN6It8 Y5+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FxHJGJrX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m4-20020a170902768400b00186a06a3396si7183400pll.153.2022.10.26.15.48.34; Wed, 26 Oct 2022 15:48:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FxHJGJrX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233677AbiJZWrx (ORCPT + 99 others); Wed, 26 Oct 2022 18:47:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233745AbiJZWrg (ORCPT ); Wed, 26 Oct 2022 18:47:36 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C6C4550BE for ; Wed, 26 Oct 2022 15:47:23 -0700 (PDT) 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 Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747792195114655430?= X-GMAIL-MSGID: =?utf-8?q?1747792195114655430?= 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: 11464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp520544wru; Wed, 26 Oct 2022 15:49:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5w8TX+Z6yDGPE+PX8Vb3njENjQEiaYQEojFIvtd7YQDxklV2lrnGSidqyV94g7tANZwL1t X-Received: by 2002:a17:907:7da5:b0:78e:2c3b:55a2 with SMTP id oz37-20020a1709077da500b0078e2c3b55a2mr38886729ejc.96.1666824550285; Wed, 26 Oct 2022 15:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666824550; cv=none; d=google.com; s=arc-20160816; b=xKK6wre3Q28EJh7utMRW7kavcFV/hDGTYuTK9ELSp6tlipBIYxIehB4jkUM3tTG2ge kjQSgs0cyNXxRIl4qIEgkcixSnI3OowfEg8VxSj9f54WqDoHwjTlwo+wiEVDIBHZHO8T hi81VCOw4F9ahNfXJ2F7+CwXELskmJV+PqSZ5JxWzdj2zF5W0BxoCfBRR7zj/Qx0PGrN uzItXM2lfRb5fs1YKBk92MsJMjKV1+NREFnQI+0bIo3upeGEQ9lHVVpCaP57wAefCEcc v3ItoLWnTGrfQ8RBZy451uXK2Sd2qr1AQOLolSGRM59jGAuFg4UzLpIbrpCvWgxEMZYc jPeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LFZsc9FN/HbKz5TOyr2KlpB+MP1p7KlrgqI8Jsnm74c=; b=vwS0rY0jZfEqobOl9uFUkJdMycl2G+Kc6UDmG+tfEwxydC6pJaFuhYG3egtECVRcwK WJ0VNkX7U5u0oXTiNfjAqAXPOpAsfyCpTxHtryzTUU59sBSacCNDNJ8NXwIvmHKZVbtA ZAATREWG3RdfGHoyJfXU5hwdE7TGfz5MNP4RlMXUlWg0LYGRved9PNg0yNhFZ12vlHYa 7yukMxwKsKW1q72bNC777bmyPLXzXlhHkrYrJE6EoRJJZUtoWz9oUAXCk+wRM6XD28dQ iZ4vYZ2vVpXvQVqopulm3PWnNR+pQvVsQOcc32NaU0Va4LowawlIyRxVEhrslYmPIQL+ 08nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SqNESA2f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kx3-20020a170907774300b0078b41dcf4b8si6135393ejc.479.2022.10.26.15.48.44; Wed, 26 Oct 2022 15:49:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SqNESA2f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233804AbiJZWr4 (ORCPT + 99 others); Wed, 26 Oct 2022 18:47:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233891AbiJZWrg (ORCPT ); Wed, 26 Oct 2022 18:47:36 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5F4C1BEAC for ; Wed, 26 Oct 2022 15:47:23 -0700 (PDT) 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 Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747792219701225624?= X-GMAIL-MSGID: =?utf-8?q?1747792219701225624?= 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);