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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D628BC63793 for ; Thu, 22 Jul 2021 10:39:58 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 07E9961279 for ; Thu, 22 Jul 2021 10:39:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07E9961279 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 smtp1.osuosl.org (Postfix) with ESMTP id CD95C8276E; Thu, 22 Jul 2021 10:39:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 IiLdVx55bYiq; Thu, 22 Jul 2021 10:39:56 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 070568277E; Thu, 22 Jul 2021 10:39:56 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D6E28C001A; Thu, 22 Jul 2021 10:39:55 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7AA47C000E for ; Thu, 22 Jul 2021 10:39:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 689A18277E for ; Thu, 22 Jul 2021 10:39:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 MnQ-cuvqHAzT for ; Thu, 22 Jul 2021 10:39:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7A4478276E for ; Thu, 22 Jul 2021 10:39:53 +0000 (UTC) Received: by mail-ed1-x52b.google.com with SMTP id ec55so6211735edb.1 for ; Thu, 22 Jul 2021 03:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=NpBBKqrdi56YhzkxFSewaW9GKDUpQ+fUhYE5+RkUh/mBRnGlUYIeNVp7gFkyHII+Wc QRxqAzGrpMvRUg6TI08B6k9huJMutm+Hx1aPAR8bebLUxzxn13SB0Kk39EHnBS3c4YZR fWGT8oKhgDjLRfSJ9uW+AomaH4j1haN9aSZ0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=exiynmzjP5VJB8YHH4XhLpzDUepi7Aj9SHB4N9KJz3agu0jrwlhVWpzrOnFHkNczbW 9T7kaAJDyLTbLtlKM/xSatcsMUrGPEyQ0J13b9clLwyJUqpffDMkH5yLF759knXRShub 4Tk59sNCUACIeee5XJurpOG47nHZTq4G7lO9DPnEs/+c71/91UBkNOkZBUdleekA3QS+ TvVgcLo8oMK1NLSdRCb4VDsXXXkySMcWgdJzykbZDz/9RM6oMAw730IGXLR1wiT5qck7 U1yH+MFFZt1DdEhcj8ry9jPX4jcG0Cw5EVBR7lMnam4WOxBZhSjybCCNg4W5cK58ikd9 QTFw== X-Gm-Message-State: AOAM532e952tT2QB5jRg8BeCohnlwCoSS/RR8I4xzdf0rjDF1vWonkve h2Je9feT8Fk/hFS8Tk1Wpuv9rw== X-Google-Smtp-Source: ABdhPJzr7EsXEh64NgUGE8NlxZu8PVM5/iUdV7lOJ1gOxWRo5nSODbf792yJ2bwdGRFWp7KaBmVx0g== X-Received: by 2002:a05:6402:d2:: with SMTP id i18mr53783290edu.17.1626950391725; Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id cq22sm12251755edb.77.2021.07.22.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Date: Thu, 22 Jul 2021 12:39:49 +0200 From: Daniel Vetter To: Desmond Cheong Zhi Xi Subject: Re: [PATCH 3/3] drm/vmwgfx: fix potential UAF in vmwgfx_surface.c Message-ID: Mail-Followup-To: Desmond Cheong Zhi Xi , linux-graphics-maintainer@vmware.com, zackr@vmware.com, airlied@linux.ie, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org References: <20210722092929.244629-1-desmondcheongzx@gmail.com> <20210722092929.244629-4-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210722092929.244629-4-desmondcheongzx@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 Cc: tzimmermann@suse.de, airlied@linux.ie, intel-gfx@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, linux-kernel@vger.kernel.org, mripard@kernel.org, linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, linux-kernel-mentees@lists.linuxfoundation.org, zackr@vmware.com 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" On Thu, Jul 22, 2021 at 05:29:29PM +0800, Desmond Cheong Zhi Xi wrote: > drm_file.master should be protected by either drm_device.master_mutex > or drm_file.master_lookup_lock when being dereferenced. However, > drm_master_get is called on unprotected file_priv->master pointers in > vmw_surface_define_ioctl and vmw_gb_surface_define_internal. > > This is fixed by replacing drm_master_get with drm_file_get_master. > > Signed-off-by: Desmond Cheong Zhi Xi Reviewed-by: Daniel Vetter I'll let Zack take a look at this and expect him to push this patch to drm-misc.git. -Daniel > --- > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > index 0eba47762bed..5d53a5f9d123 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > @@ -865,7 +865,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, > user_srf->prime.base.shareable = false; > user_srf->prime.base.tfile = NULL; > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > /** > * From this point, the generic resource management functions > @@ -1534,7 +1534,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, > > user_srf = container_of(srf, struct vmw_user_surface, srf); > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > res = &user_srf->srf.res; > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 8DF07C63793 for ; Thu, 22 Jul 2021 10:39:55 +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 4BE656127C for ; Thu, 22 Jul 2021 10:39:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BE656127C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 B42EF6E526; Thu, 22 Jul 2021 10:39:54 +0000 (UTC) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by gabe.freedesktop.org (Postfix) with ESMTPS id 115776E526 for ; Thu, 22 Jul 2021 10:39:53 +0000 (UTC) Received: by mail-ed1-x533.google.com with SMTP id k27so6175445edk.9 for ; Thu, 22 Jul 2021 03:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=NpBBKqrdi56YhzkxFSewaW9GKDUpQ+fUhYE5+RkUh/mBRnGlUYIeNVp7gFkyHII+Wc QRxqAzGrpMvRUg6TI08B6k9huJMutm+Hx1aPAR8bebLUxzxn13SB0Kk39EHnBS3c4YZR fWGT8oKhgDjLRfSJ9uW+AomaH4j1haN9aSZ0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=lxeA/cS4/EaM4EwNyNhgODYICYy3EQFHkRotlTMGbWZFiQKbPeqfogroz1wWZu1SBL czMk3dsG2SLbbhxopMuPYrKnPEfak1zhCoMipjHZcVSAGvBzmCt7iEMgpIHGdPMu4tPB uNjjqc0DNOO41YczQtwbGjIthaDFPIP/+6HM+fIkYyxnC7zBFyKvadlPvobWxwXB7UrC pWdeDmeXRnMebSICjtVB9fRAqCEedxl8U7pXUngScojW022UHMGrzjQMSNUjyQRwAwSg Ox/2R2Vr27ZGm/1jrbr9bVk8VMQpYIi6PStAWvckMYxINp1LswKnIxJTxzXoMxd4g+a7 86ZA== X-Gm-Message-State: AOAM533lfjeauNnNTJwZtUFFlPJ1ytr+dB4b/Qy7th8vPspY3+JQYdup gR3Q3HA4NxPCfK73XuJ/RWB3DPBxj5/tMA== X-Google-Smtp-Source: ABdhPJzr7EsXEh64NgUGE8NlxZu8PVM5/iUdV7lOJ1gOxWRo5nSODbf792yJ2bwdGRFWp7KaBmVx0g== X-Received: by 2002:a05:6402:d2:: with SMTP id i18mr53783290edu.17.1626950391725; Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id cq22sm12251755edb.77.2021.07.22.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Date: Thu, 22 Jul 2021 12:39:49 +0200 From: Daniel Vetter To: Desmond Cheong Zhi Xi Subject: Re: [PATCH 3/3] drm/vmwgfx: fix potential UAF in vmwgfx_surface.c Message-ID: Mail-Followup-To: Desmond Cheong Zhi Xi , linux-graphics-maintainer@vmware.com, zackr@vmware.com, airlied@linux.ie, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org References: <20210722092929.244629-1-desmondcheongzx@gmail.com> <20210722092929.244629-4-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210722092929.244629-4-desmondcheongzx@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 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: tzimmermann@suse.de, airlied@linux.ie, gregkh@linuxfoundation.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Jul 22, 2021 at 05:29:29PM +0800, Desmond Cheong Zhi Xi wrote: > drm_file.master should be protected by either drm_device.master_mutex > or drm_file.master_lookup_lock when being dereferenced. However, > drm_master_get is called on unprotected file_priv->master pointers in > vmw_surface_define_ioctl and vmw_gb_surface_define_internal. > > This is fixed by replacing drm_master_get with drm_file_get_master. > > Signed-off-by: Desmond Cheong Zhi Xi Reviewed-by: Daniel Vetter I'll let Zack take a look at this and expect him to push this patch to drm-misc.git. -Daniel > --- > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > index 0eba47762bed..5d53a5f9d123 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > @@ -865,7 +865,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, > user_srf->prime.base.shareable = false; > user_srf->prime.base.tfile = NULL; > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > /** > * From this point, the generic resource management functions > @@ -1534,7 +1534,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, > > user_srf = container_of(srf, struct vmw_user_surface, srf); > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > res = &user_srf->srf.res; > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0B15EC63793 for ; Thu, 22 Jul 2021 10:40:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4EC26127C for ; Thu, 22 Jul 2021 10:40:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231646AbhGVJ7Y (ORCPT ); Thu, 22 Jul 2021 05:59:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230410AbhGVJ7W (ORCPT ); Thu, 22 Jul 2021 05:59:22 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 026D6C061575 for ; Thu, 22 Jul 2021 03:39:58 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id t3so6181028edc.7 for ; Thu, 22 Jul 2021 03:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=NpBBKqrdi56YhzkxFSewaW9GKDUpQ+fUhYE5+RkUh/mBRnGlUYIeNVp7gFkyHII+Wc QRxqAzGrpMvRUg6TI08B6k9huJMutm+Hx1aPAR8bebLUxzxn13SB0Kk39EHnBS3c4YZR fWGT8oKhgDjLRfSJ9uW+AomaH4j1haN9aSZ0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=tqpslWeR4pJVPClFhS2TkPvrSEgnSYH9DvAyqUnBKz3i8pWVI3/aYNiMHhuOJHIhgX NvlIXFaMH4kJ4dTGuH3NRxsSydJLrwOgY3rEdLUVcdFkTeoGw2akChik483ql+HH1O0H q5sjnmyMIz74SJuwS85QTbCv/RLEUXQwyiRs7HnwiFZpHKYJ7dhA6eFiI5/5z7nGn3pq TQ2MbZqfPz3ZJM4l3sltr/gEbpaBScOJUSKe66JpCYjDRJarTUZ9w7TkwoEGZSeFAD9o yjo7hJf9XJ0gYWlhOw6q5U3/pRBwZCVGZRgQh+IGQEGpmcdEx4gXj/sgF0PFGAlqkEik BRBA== X-Gm-Message-State: AOAM53344kRJgR8M3RikXyOJAGyqvWwbd194eAYAeLWCYRr+tni3M6/7 09uEhuEmbuplEjo6ksrC47DJbw== X-Google-Smtp-Source: ABdhPJzr7EsXEh64NgUGE8NlxZu8PVM5/iUdV7lOJ1gOxWRo5nSODbf792yJ2bwdGRFWp7KaBmVx0g== X-Received: by 2002:a05:6402:d2:: with SMTP id i18mr53783290edu.17.1626950391725; Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id cq22sm12251755edb.77.2021.07.22.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Date: Thu, 22 Jul 2021 12:39:49 +0200 From: Daniel Vetter To: Desmond Cheong Zhi Xi Cc: linux-graphics-maintainer@vmware.com, zackr@vmware.com, airlied@linux.ie, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: Re: [PATCH 3/3] drm/vmwgfx: fix potential UAF in vmwgfx_surface.c Message-ID: Mail-Followup-To: Desmond Cheong Zhi Xi , linux-graphics-maintainer@vmware.com, zackr@vmware.com, airlied@linux.ie, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org References: <20210722092929.244629-1-desmondcheongzx@gmail.com> <20210722092929.244629-4-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210722092929.244629-4-desmondcheongzx@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 22, 2021 at 05:29:29PM +0800, Desmond Cheong Zhi Xi wrote: > drm_file.master should be protected by either drm_device.master_mutex > or drm_file.master_lookup_lock when being dereferenced. However, > drm_master_get is called on unprotected file_priv->master pointers in > vmw_surface_define_ioctl and vmw_gb_surface_define_internal. > > This is fixed by replacing drm_master_get with drm_file_get_master. > > Signed-off-by: Desmond Cheong Zhi Xi Reviewed-by: Daniel Vetter I'll let Zack take a look at this and expect him to push this patch to drm-misc.git. -Daniel > --- > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > index 0eba47762bed..5d53a5f9d123 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > @@ -865,7 +865,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, > user_srf->prime.base.shareable = false; > user_srf->prime.base.tfile = NULL; > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > /** > * From this point, the generic resource management functions > @@ -1534,7 +1534,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, > > user_srf = container_of(srf, struct vmw_user_surface, srf); > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > res = &user_srf->srf.res; > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D62C1C63797 for ; Thu, 22 Jul 2021 10:39:58 +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 9A2AE6127C for ; Thu, 22 Jul 2021 10:39:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A2AE6127C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 07F846E8CA; Thu, 22 Jul 2021 10:39:55 +0000 (UTC) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 256BA6E8CA for ; Thu, 22 Jul 2021 10:39:53 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id w14so6188532edc.8 for ; Thu, 22 Jul 2021 03:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=NpBBKqrdi56YhzkxFSewaW9GKDUpQ+fUhYE5+RkUh/mBRnGlUYIeNVp7gFkyHII+Wc QRxqAzGrpMvRUg6TI08B6k9huJMutm+Hx1aPAR8bebLUxzxn13SB0Kk39EHnBS3c4YZR fWGT8oKhgDjLRfSJ9uW+AomaH4j1haN9aSZ0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=jnlm21J6SlYJjPe81X61eHbfm5OMgcOz8zyqmSLYvPQ=; b=sK0wNP2gTD/HI42EUwP4rTUNf7cEBwXvfD5votCdZN2qCasKYffNMgqZYWVMHBgN9B AIoOyDKENvTH9wsL6URm2cKrEdmCoT4HHXIkbt9bIlpHX0TrdVs0t9bdi4PsDAzeeQPy inwzCa4AFqebgZuEVMVKTZeVAHlbn4xNYX+9oQ1POdMiDXU2wytkzOouBP1M2cLC9z+F 5o1dWtLX1Az+B2A5JRnx0X8+AHGExtKcxTYCItlnMDPYWim3Q0iOXr5OOGXQQ81Nt4iF u/XVgVpaglrMDYtnWDRbM94O746nNzi5g9xPLxfn6mX983HsC210VouW2Pf5/lcr9IXb +lpQ== X-Gm-Message-State: AOAM533UMIcrDD8yPKnXZNM9B7v8Q0Dn2LGvtDhkhAZPSfts7cltAhCu qHZUTiRxa3IMBp1bM8BnVA026Q== X-Google-Smtp-Source: ABdhPJzr7EsXEh64NgUGE8NlxZu8PVM5/iUdV7lOJ1gOxWRo5nSODbf792yJ2bwdGRFWp7KaBmVx0g== X-Received: by 2002:a05:6402:d2:: with SMTP id i18mr53783290edu.17.1626950391725; Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id cq22sm12251755edb.77.2021.07.22.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:39:51 -0700 (PDT) Date: Thu, 22 Jul 2021 12:39:49 +0200 From: Daniel Vetter To: Desmond Cheong Zhi Xi Message-ID: Mail-Followup-To: Desmond Cheong Zhi Xi , linux-graphics-maintainer@vmware.com, zackr@vmware.com, airlied@linux.ie, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, skhan@linuxfoundation.org, gregkh@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org References: <20210722092929.244629-1-desmondcheongzx@gmail.com> <20210722092929.244629-4-desmondcheongzx@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210722092929.244629-4-desmondcheongzx@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 Subject: Re: [Intel-gfx] [PATCH 3/3] drm/vmwgfx: fix potential UAF in vmwgfx_surface.c X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tzimmermann@suse.de, airlied@linux.ie, gregkh@linuxfoundation.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, mripard@kernel.org, linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, zackr@vmware.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Jul 22, 2021 at 05:29:29PM +0800, Desmond Cheong Zhi Xi wrote: > drm_file.master should be protected by either drm_device.master_mutex > or drm_file.master_lookup_lock when being dereferenced. However, > drm_master_get is called on unprotected file_priv->master pointers in > vmw_surface_define_ioctl and vmw_gb_surface_define_internal. > > This is fixed by replacing drm_master_get with drm_file_get_master. > > Signed-off-by: Desmond Cheong Zhi Xi Reviewed-by: Daniel Vetter I'll let Zack take a look at this and expect him to push this patch to drm-misc.git. -Daniel > --- > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > index 0eba47762bed..5d53a5f9d123 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c > @@ -865,7 +865,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, > user_srf->prime.base.shareable = false; > user_srf->prime.base.tfile = NULL; > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > /** > * From this point, the generic resource management functions > @@ -1534,7 +1534,7 @@ vmw_gb_surface_define_internal(struct drm_device *dev, > > user_srf = container_of(srf, struct vmw_user_surface, srf); > if (drm_is_primary_client(file_priv)) > - user_srf->master = drm_master_get(file_priv->master); > + user_srf->master = drm_file_get_master(file_priv); > > res = &user_srf->srf.res; > > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx