From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 08A26C48BE5 for ; Sat, 12 Jun 2021 12:55:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEE77613BC for ; Sat, 12 Jun 2021 12:55:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbhFLM5X (ORCPT ); Sat, 12 Jun 2021 08:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230191AbhFLM5V (ORCPT ); Sat, 12 Jun 2021 08:57:21 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E64FC061574 for ; Sat, 12 Jun 2021 05:55:22 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id e33so33106pgm.3 for ; Sat, 12 Jun 2021 05:55:22 -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 :mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=OHqcytAxEtLThghXPcTSEi53Ohzx6AgIjzBIhVcGvJReCNgvxY9AnjobCmUU4mdJVE pcf9tVP9Asz4EH9lh1l/mD9UX6t4unHIs7mNX8y1wB86fbPwEdHMgemFtR/9JMoiPMmZ yQZbYibwsJ7Odwcabf7KfwmtpkKfIBHc5Rf0bjJJh5IpVuJ3kTuQsB2wC2hGCjm7tmE5 FPNtVx05YnNjDVpggnYZFjbNf6qIK0/TE+M8q4YnBH2d1apsP3eNXz91KCbCcqcwhfgO ANJDl5bowY1QyLXlUUtglUgkJWC4qlhFDE/8c3nngAUv5rwZMiIYRLi53Q+PT0hxQTTS y+IA== 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:mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=EW3mq6HgHEGv6EhT8hGVEWAD6zZN7WyIZ2xLk0t35b91Tv0LuMmY6y9Yl/lb1QVKyd 41Qq1UMBoxV5kOMWSbiA98z+WJZa1B+GPQsurslpK6+V7IAiHMXAWdtfyyfH18du6Yo8 UUv2/t28GSNReUcwUXhVxrj5fhYEqq/SO19JuSMgPirbSnZgyfML9TSY7foofVTekOtQ UugEdR7scgoQs9U4wUbMqpQw7YAneH/OgKPbXon/jBJ0JzFGsaMGqKzf1zGoWh4Td2NJ MZWsc+tOrAX/EpMS3YoAWL/PkcvZNmiwCeleFWSyH4mU6Pfhgsr+Q5uPhAluyih7bV/9 aLLQ== X-Gm-Message-State: AOAM532eg/PaZJtcQa3Qd12oyxHRkFqCleWgIqRsls3kVp11iSzvjMUj ObmlHTrdEefDi8zpLy74LstYQ3J5RZWgyTL0ETA= X-Google-Smtp-Source: ABdhPJxcPLkxJPfGeQDXgL6AeZKlPhDG/fM9lxRpRH8ptyrfytCsDXnGBvQV2fQLW2IWza2dLfQUug== X-Received: by 2002:a62:7705:0:b029:2f0:94d6:78c9 with SMTP id s5-20020a6277050000b02902f094d678c9mr10155406pfc.25.1623502522053; Sat, 12 Jun 2021 05:55:22 -0700 (PDT) Received: from localhost.localdomain ([118.200.190.93]) by smtp.gmail.com with ESMTPSA id c7sm8015498pgh.72.2021.06.12.05.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jun 2021 05:55:21 -0700 (PDT) From: Desmond Cheong Zhi Xi To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch Cc: Desmond Cheong Zhi Xi , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, Daniel Vetter Subject: [PATCH 1/2] drm: Add a locked version of drm_is_current_master Date: Sat, 12 Jun 2021 20:54:25 +0800 Message-Id: <20210612125426.6451-2-desmondcheongzx@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210612125426.6451-1-desmondcheongzx@gmail.com> References: <20210612125426.6451-1-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While checking the master status of the DRM file in drm_is_current_master(), the device's master mutex should be held. Without the mutex, the pointer fpriv->master may be freed concurrently by another process calling drm_setmaster_ioctl(). This could lead to use-after-free errors when the pointer is subsequently dereferenced in drm_lease_owner(). The callers of drm_is_current_master() from drm_auth.c hold the device's master mutex, but external callers do not. Hence, we implement drm_is_current_master_locked() to be used within drm_auth.c, and modify drm_is_current_master() to grab the device's master mutex before checking the master status. Reported-by: Daniel Vetter Signed-off-by: Desmond Cheong Zhi Xi --- drivers/gpu/drm/drm_auth.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 232abbba3686..c6bf52c310a9 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -61,6 +61,8 @@ * trusted clients. */ +static bool drm_is_current_master_locked(struct drm_file *fpriv); + int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_auth *auth = data; @@ -223,7 +225,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (drm_is_current_master(file_priv)) + if (drm_is_current_master_locked(file_priv)) goto out_unlock; if (dev->master) { @@ -272,7 +274,7 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (!drm_is_current_master(file_priv)) { + if (!drm_is_current_master_locked(file_priv)) { ret = -EINVAL; goto out_unlock; } @@ -321,7 +323,7 @@ void drm_master_release(struct drm_file *file_priv) if (file_priv->magic) idr_remove(&file_priv->master->magic_map, file_priv->magic); - if (!drm_is_current_master(file_priv)) + if (!drm_is_current_master_locked(file_priv)) goto out; drm_legacy_lock_master_cleanup(dev, master); @@ -342,6 +344,13 @@ void drm_master_release(struct drm_file *file_priv) mutex_unlock(&dev->master_mutex); } +static bool drm_is_current_master_locked(struct drm_file *fpriv) +{ + lockdep_assert_held_once(&fpriv->master->dev->master_mutex); + + return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; +} + /** * drm_is_current_master - checks whether @priv is the current master * @fpriv: DRM file private @@ -354,7 +363,13 @@ void drm_master_release(struct drm_file *file_priv) */ bool drm_is_current_master(struct drm_file *fpriv) { - return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; + bool ret; + + mutex_lock(&fpriv->master->dev->master_mutex); + ret = drm_is_current_master_locked(fpriv); + mutex_unlock(&fpriv->master->dev->master_mutex); + + return ret; } EXPORT_SYMBOL(drm_is_current_master); -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 B0667C48BE8 for ; Sat, 12 Jun 2021 12:55:27 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E3C46108E for ; Sat, 12 Jun 2021 12:55:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E3C46108E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2B3FC605F9; Sat, 12 Jun 2021 12:55:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YEGXHVcjesnH; Sat, 12 Jun 2021 12:55:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 42122605ED; Sat, 12 Jun 2021 12:55:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1ED20C000E; Sat, 12 Jun 2021 12:55:26 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3F46EC000B for ; Sat, 12 Jun 2021 12:55:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2E58B839E9 for ; Sat, 12 Jun 2021 12:55:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E6kJcOdtInA9 for ; Sat, 12 Jun 2021 12:55:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9727E83926 for ; Sat, 12 Jun 2021 12:55:22 +0000 (UTC) Received: by mail-pg1-x52f.google.com with SMTP id o9so4776367pgd.2 for ; Sat, 12 Jun 2021 05:55:22 -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 :mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=OHqcytAxEtLThghXPcTSEi53Ohzx6AgIjzBIhVcGvJReCNgvxY9AnjobCmUU4mdJVE pcf9tVP9Asz4EH9lh1l/mD9UX6t4unHIs7mNX8y1wB86fbPwEdHMgemFtR/9JMoiPMmZ yQZbYibwsJ7Odwcabf7KfwmtpkKfIBHc5Rf0bjJJh5IpVuJ3kTuQsB2wC2hGCjm7tmE5 FPNtVx05YnNjDVpggnYZFjbNf6qIK0/TE+M8q4YnBH2d1apsP3eNXz91KCbCcqcwhfgO ANJDl5bowY1QyLXlUUtglUgkJWC4qlhFDE/8c3nngAUv5rwZMiIYRLi53Q+PT0hxQTTS y+IA== 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:mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=RY8yaejJtv+D16Ye1uS14wZDHsU+ZBe0qcluyYdF4v2cto2Ng3aCG7O7q9yknEYvX7 vEOPC9pwctGH8dRrGQlOI3R30qNzrun+it0JgUXtTuWoN3sDE9uqaw/RFLSCope9fE7c Jd9VgvaC0q/N91zlNjmNvwvLgZ+lJCY6DyH8tdKgRbO1LC7WAFZNSxKYx88mL2pqk8Lj FvvwVVI/wopX0mulSv7HPwZecHkvk8lrcD4cZbKiTun5TaUq3lK3ay4MnLgK/0kXbebH CzmvMtS/Cl/B8PDFCj/jdU8EhOstkfkX6hzS128oUhunTvWLxRswVoiOc8tChuol9RkY 9sIg== X-Gm-Message-State: AOAM532ynGmJbJThSPIfNoFCkpWdKJGDBDmolFNEJRUwztHQxvR/aqkG dh0o4bEV01AuOJKSZ/Q+hoM= X-Google-Smtp-Source: ABdhPJxcPLkxJPfGeQDXgL6AeZKlPhDG/fM9lxRpRH8ptyrfytCsDXnGBvQV2fQLW2IWza2dLfQUug== X-Received: by 2002:a62:7705:0:b029:2f0:94d6:78c9 with SMTP id s5-20020a6277050000b02902f094d678c9mr10155406pfc.25.1623502522053; Sat, 12 Jun 2021 05:55:22 -0700 (PDT) Received: from localhost.localdomain ([118.200.190.93]) by smtp.gmail.com with ESMTPSA id c7sm8015498pgh.72.2021.06.12.05.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jun 2021 05:55:21 -0700 (PDT) From: Desmond Cheong Zhi Xi To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch Subject: [PATCH 1/2] drm: Add a locked version of drm_is_current_master Date: Sat, 12 Jun 2021 20:54:25 +0800 Message-Id: <20210612125426.6451-2-desmondcheongzx@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210612125426.6451-1-desmondcheongzx@gmail.com> References: <20210612125426.6451-1-desmondcheongzx@gmail.com> MIME-Version: 1.0 Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Desmond Cheong Zhi Xi , linux-kernel-mentees@lists.linuxfoundation.org X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" While checking the master status of the DRM file in drm_is_current_master(), the device's master mutex should be held. Without the mutex, the pointer fpriv->master may be freed concurrently by another process calling drm_setmaster_ioctl(). This could lead to use-after-free errors when the pointer is subsequently dereferenced in drm_lease_owner(). The callers of drm_is_current_master() from drm_auth.c hold the device's master mutex, but external callers do not. Hence, we implement drm_is_current_master_locked() to be used within drm_auth.c, and modify drm_is_current_master() to grab the device's master mutex before checking the master status. Reported-by: Daniel Vetter Signed-off-by: Desmond Cheong Zhi Xi --- drivers/gpu/drm/drm_auth.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 232abbba3686..c6bf52c310a9 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -61,6 +61,8 @@ * trusted clients. */ +static bool drm_is_current_master_locked(struct drm_file *fpriv); + int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_auth *auth = data; @@ -223,7 +225,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (drm_is_current_master(file_priv)) + if (drm_is_current_master_locked(file_priv)) goto out_unlock; if (dev->master) { @@ -272,7 +274,7 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (!drm_is_current_master(file_priv)) { + if (!drm_is_current_master_locked(file_priv)) { ret = -EINVAL; goto out_unlock; } @@ -321,7 +323,7 @@ void drm_master_release(struct drm_file *file_priv) if (file_priv->magic) idr_remove(&file_priv->master->magic_map, file_priv->magic); - if (!drm_is_current_master(file_priv)) + if (!drm_is_current_master_locked(file_priv)) goto out; drm_legacy_lock_master_cleanup(dev, master); @@ -342,6 +344,13 @@ void drm_master_release(struct drm_file *file_priv) mutex_unlock(&dev->master_mutex); } +static bool drm_is_current_master_locked(struct drm_file *fpriv) +{ + lockdep_assert_held_once(&fpriv->master->dev->master_mutex); + + return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; +} + /** * drm_is_current_master - checks whether @priv is the current master * @fpriv: DRM file private @@ -354,7 +363,13 @@ void drm_master_release(struct drm_file *file_priv) */ bool drm_is_current_master(struct drm_file *fpriv) { - return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; + bool ret; + + mutex_lock(&fpriv->master->dev->master_mutex); + ret = drm_is_current_master_locked(fpriv); + mutex_unlock(&fpriv->master->dev->master_mutex); + + return ret; } EXPORT_SYMBOL(drm_is_current_master); -- 2.25.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 75527C48BCF for ; Sat, 12 Jun 2021 12:55:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4216E610C9 for ; Sat, 12 Jun 2021 12:55:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4216E610C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBC3F6E11A; Sat, 12 Jun 2021 12:55:23 +0000 (UTC) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 66AAC6E11A for ; Sat, 12 Jun 2021 12:55:22 +0000 (UTC) Received: by mail-pf1-x42e.google.com with SMTP id k15so6750082pfp.6 for ; Sat, 12 Jun 2021 05:55:22 -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 :mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=OHqcytAxEtLThghXPcTSEi53Ohzx6AgIjzBIhVcGvJReCNgvxY9AnjobCmUU4mdJVE pcf9tVP9Asz4EH9lh1l/mD9UX6t4unHIs7mNX8y1wB86fbPwEdHMgemFtR/9JMoiPMmZ yQZbYibwsJ7Odwcabf7KfwmtpkKfIBHc5Rf0bjJJh5IpVuJ3kTuQsB2wC2hGCjm7tmE5 FPNtVx05YnNjDVpggnYZFjbNf6qIK0/TE+M8q4YnBH2d1apsP3eNXz91KCbCcqcwhfgO ANJDl5bowY1QyLXlUUtglUgkJWC4qlhFDE/8c3nngAUv5rwZMiIYRLi53Q+PT0hxQTTS y+IA== 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:mime-version:content-transfer-encoding; bh=1hTuY7U1R+ySW1pBhYnqPXW/iY7lo4A0jpCZdHDRERo=; b=RkZLxS2Ulj4Y5BcPMTsp3fRpDgw1wyCo99ANUUN+TRo8MRCuwJ0nAYImiOXbM22lwD koSHJ7++vvqTDsrNUB5GW9vhknTFQCNEqqN90Vj/TcFRekLox+LlBz++O7fapBfSeT0D 0kEKt+G07TkPpzymmsBicMO8LishbbfWORBeoFCsb7eYzZfTLZX5r1gRBOo3uQiTWWFb z7AWyLmp/FLurHFitzOpwMQURImMctCowhPXEvFDTyGPyXXnR4UspRemQHCFPNoEcYqU Epr4GMkIfAKDsRODKyg/1gDj/G2eBFO53zaq+j6Nd2h2xHufnTod308Y0Ik+QxqbRPL3 3DTA== X-Gm-Message-State: AOAM530bhhhI2G8Z+di8cYm8TS0YMi6wYrKhBkkwURShL/0QT52l8LG9 Od1jDkeaHDprQuTxIR/GXU0= X-Google-Smtp-Source: ABdhPJxcPLkxJPfGeQDXgL6AeZKlPhDG/fM9lxRpRH8ptyrfytCsDXnGBvQV2fQLW2IWza2dLfQUug== X-Received: by 2002:a62:7705:0:b029:2f0:94d6:78c9 with SMTP id s5-20020a6277050000b02902f094d678c9mr10155406pfc.25.1623502522053; Sat, 12 Jun 2021 05:55:22 -0700 (PDT) Received: from localhost.localdomain ([118.200.190.93]) by smtp.gmail.com with ESMTPSA id c7sm8015498pgh.72.2021.06.12.05.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jun 2021 05:55:21 -0700 (PDT) From: Desmond Cheong Zhi Xi To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch Subject: [PATCH 1/2] drm: Add a locked version of drm_is_current_master Date: Sat, 12 Jun 2021 20:54:25 +0800 Message-Id: <20210612125426.6451-2-desmondcheongzx@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210612125426.6451-1-desmondcheongzx@gmail.com> References: <20210612125426.6451-1-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , skhan@linuxfoundation.org, Desmond Cheong Zhi Xi , linux-kernel-mentees@lists.linuxfoundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" While checking the master status of the DRM file in drm_is_current_master(), the device's master mutex should be held. Without the mutex, the pointer fpriv->master may be freed concurrently by another process calling drm_setmaster_ioctl(). This could lead to use-after-free errors when the pointer is subsequently dereferenced in drm_lease_owner(). The callers of drm_is_current_master() from drm_auth.c hold the device's master mutex, but external callers do not. Hence, we implement drm_is_current_master_locked() to be used within drm_auth.c, and modify drm_is_current_master() to grab the device's master mutex before checking the master status. Reported-by: Daniel Vetter Signed-off-by: Desmond Cheong Zhi Xi --- drivers/gpu/drm/drm_auth.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 232abbba3686..c6bf52c310a9 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -61,6 +61,8 @@ * trusted clients. */ +static bool drm_is_current_master_locked(struct drm_file *fpriv); + int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_auth *auth = data; @@ -223,7 +225,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (drm_is_current_master(file_priv)) + if (drm_is_current_master_locked(file_priv)) goto out_unlock; if (dev->master) { @@ -272,7 +274,7 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, if (ret) goto out_unlock; - if (!drm_is_current_master(file_priv)) { + if (!drm_is_current_master_locked(file_priv)) { ret = -EINVAL; goto out_unlock; } @@ -321,7 +323,7 @@ void drm_master_release(struct drm_file *file_priv) if (file_priv->magic) idr_remove(&file_priv->master->magic_map, file_priv->magic); - if (!drm_is_current_master(file_priv)) + if (!drm_is_current_master_locked(file_priv)) goto out; drm_legacy_lock_master_cleanup(dev, master); @@ -342,6 +344,13 @@ void drm_master_release(struct drm_file *file_priv) mutex_unlock(&dev->master_mutex); } +static bool drm_is_current_master_locked(struct drm_file *fpriv) +{ + lockdep_assert_held_once(&fpriv->master->dev->master_mutex); + + return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; +} + /** * drm_is_current_master - checks whether @priv is the current master * @fpriv: DRM file private @@ -354,7 +363,13 @@ void drm_master_release(struct drm_file *file_priv) */ bool drm_is_current_master(struct drm_file *fpriv) { - return fpriv->is_master && drm_lease_owner(fpriv->master) == fpriv->minor->dev->master; + bool ret; + + mutex_lock(&fpriv->master->dev->master_mutex); + ret = drm_is_current_master_locked(fpriv); + mutex_unlock(&fpriv->master->dev->master_mutex); + + return ret; } EXPORT_SYMBOL(drm_is_current_master); -- 2.25.1